Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 19198) +++ /applications/editors/josm/i18n/po/ar.po (revision 19199) @@ -4,11 +4,12 @@ # FIRST AUTHOR , 2009. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-29 22:18+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-20 21:31+0000\n" +"Last-Translator: metehyi \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" @@ -17,38 +18,38 @@ "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: 2009-12-06 13:19+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "المساعدة" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "تجاهل URL سيئة التكوين: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -60,21 +61,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -95,17 +96,8 @@ msgstr "التحذير" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" -msgstr "تجاهل عنوان الملف المشوه : \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" +msgstr "تجاهل URL ملف غيرصحيح التكوين: \"{0}\"" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -113,8 +105,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "لم أتمكن من قراءة الوثيقة ''{0}''.
الخطء هو :
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -122,10 +123,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -137,9 +138,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -148,6 +150,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -202,8 +204,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -271,5 +273,5 @@ msgstr "حول JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -278,5 +280,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -285,5 +287,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -292,15 +294,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "تابع" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -309,29 +316,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -348,5 +356,9 @@ msgstr "إلغاء" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -362,5 +374,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "إدمج" @@ -378,15 +390,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "أضف عقدة..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "أضف عقدة بواسطة خط الطول و خط العرض." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -402,22 +414,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "حرّر : {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "أدخل الأحداثيات للعقدة الجديدة." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "إستعمل الدرجات العشرية." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "القيم السلبية هي لنصف الكرة الغربية/الجنوبية" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -426,5 +438,5 @@ msgstr "خط العرض" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -433,28 +445,29 @@ msgstr "خط الطول" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +msgstr "الرجاء إدخال خط طول صالح من ضمن المجال -90..90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +msgstr "الرجاء إدخال خط طول من ضمن المجال -90..90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +msgstr "الرجاء إدخال خط عرض صالح من ضمن المجال -180..180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +msgstr "الرجاء إدخال خط عرض من ضمن المجال -180..180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -466,11 +479,11 @@ msgstr "مُوافق" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +msgstr "أغلق الحوار و أنشئ عقدة جديدة" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "أغلق الحوار، لا تأنشئ عقدة جديدة" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -489,18 +502,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -512,5 +525,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -532,6 +545,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -578,5 +591,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "التناقض" @@ -613,14 +626,15 @@ msgstr "لا تناقضات للتكبير عليها" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +msgstr "أغلق حزمات التغييرات المفتوحة" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +msgstr "يغلق حزمات التغييرات المفتوحة" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -630,23 +644,23 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "الملف : {0}" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "لا يوجد حزمات تغييرات مفتوحة" + #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -msgid "There are no open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +msgstr "لا يوجد حزمات تغييرات مفتوحة" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." -msgstr "" +msgstr "جاري تنزيل حزمات تغييرات مفتوحة" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 @@ -725,11 +739,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -807,16 +822,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -829,9 +849,9 @@ #, java-format msgid "There were {0} conflicts during import." -msgstr "" +msgstr "حصل {0} تضارب خلال الإسيراد" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231 msgid "Conflicts during download" -msgstr "" +msgstr "تضاربات حين التنزيل" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256 @@ -852,5 +872,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "نسخة مطابقة" @@ -880,10 +900,10 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "عرض ملء الشاشة" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "تبديل عرض ملء الشاشة" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 @@ -893,10 +913,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "صدّر إلى GPX ..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "صدّر المعطيات إلى ملف GPX..." @@ -911,12 +931,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -941,8 +961,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -953,10 +973,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -969,17 +989,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1016,22 +1036,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "الرجاء إختر على الأقل طريقتين للدمج." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1041,38 +1066,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgstr "الرجاء إجهاض العملية إن لم تكن أكيداَ" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgstr "تمت إضافة العقدة على كل التقطعات" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgstr "صلّح العلاقات" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1080,33 +1101,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "ادخل القيم لكل التناقضات." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "حلل التناقضات" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgstr "صلّح تضاربات التسمية" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgstr "تم حذف العنصر من العلاقات" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1131,5 +1152,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 msgid "Jump To Position" -msgstr "" +msgstr "أقفز إلى الموقع" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 @@ -1147,5 +1168,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 msgid "Zoom (in metres)" -msgstr "" +msgstr "التكبير (بلأمتار)" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 @@ -1156,9 +1177,9 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 msgid "Jump there" -msgstr "" +msgstr "اقفز إلى هناك" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 msgid "Jump to Position" -msgstr "" +msgstr "اقفز إلى الموقع" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 @@ -1231,5 +1252,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 msgid "Please select at least one node or way." -msgstr "" +msgstr "الرجاء إختيار على الأقل عقدة أو طريق" #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 @@ -1269,5 +1290,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "غير قادر على تحريك الأغراض إلى خارج الدنيا" @@ -1345,30 +1366,30 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109 msgid "Download Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +msgstr "نزل معطيات" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "حرّك العقد حيث تكون الزوايا 90 أو 270 درجة" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1377,9 +1398,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1388,16 +1409,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "إسقاط عمودي" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "الاستعمال" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "إسقاط عمودي" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1468,20 +1489,20 @@ #, java-format msgid "Could not rename file ''{0}''" -msgstr "" - +msgstr "لم أتمكن من إعادة تسمية الوثيقة ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "أعكس إتجاه الطرقات" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "أعكس إتجاه كل الطرقات المختارة." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "الرجاء إختيار على الأقل طريق واحدة." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "أعكس إتجاه الطرقات" @@ -1490,10 +1511,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "إحفَظ" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "إحفظ المعطيات الحالية." @@ -1502,5 +1523,5 @@ #, java-format msgid "File {0} exists. Overwrite?" -msgstr "" +msgstr "الوثيقة {0} موجودة. الكتابة عليها ؟" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 @@ -1544,14 +1565,14 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 msgid "Save Layer" -msgstr "" +msgstr "إحفظ الطبقة" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "إحفظ كــ ..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "إحفظ المعطيات الحالية في ملف جديد." @@ -1592,6 +1613,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1620,8 +1640,8 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 msgid "Are you sure?" -msgstr "" +msgstr "هل أنت متأكد ؟" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1684,5 +1704,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1690,5 +1710,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1696,5 +1716,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1728,43 +1748,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "إختر أي من :" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +msgid "* One tagged node, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way, or" msgstr "* عقدة واحدة مستعملة من أكثر من طريق واحدة، أو" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1774,9 +1794,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1784,5 +1804,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1817,10 +1837,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1828,53 +1848,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1883,5 +1899,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1889,131 +1905,7 @@ msgstr "لا يوجد تغييرات للتحميل." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2148,9 +2040,9 @@ msgstr "تمّ تنزيل معطيات جهاز نظام تحديد المواقع العالمي" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "جاري تحميل المعطيات" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2158,5 +2050,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2227,7 +2119,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2242,58 +2134,52 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "أرسم" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "أرسم عقد" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "مُنتقى" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "أضافة عقدة" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "إضافة عقدة إلى طريق" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "إضافة عقدة جديدة إلى طريق موجودة" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "انشئ عقدة جديدة" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "إختر العقدة الموجودة تحت المزلاق." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2302,14 +2188,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "إبدء طريق جديدة من العقدة الأخيرة." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "تابع طريق من العقدة الأخيرة." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "إنهي الرسم." @@ -2348,18 +2234,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "إختر" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "إختر، حرّك و دوّر أغراض" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2368,17 +2255,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2388,22 +2275,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2413,5 +2300,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "تكبير/تصغير" @@ -2433,5 +2320,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "بحث عن أغراض." @@ -2519,7 +2406,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "المستخدم:... - كلّ الأغراض اللتي قام المستخدم بتغييرها" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2528,8 +2414,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "العقد:... - الغرض ذات عدد العقد المحدد" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "العقد:... - الغرض ذات عدد العقد المحدد" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2537,45 +2433,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "مغيير - كلّ الأغراض المغييرة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "المختارة - كلّ الأغراض المختارة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "غير المكتملة - كلّ الأغراض غير المكتملة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "غير المسمات - كلّ الأغراض غير المسمات" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "إستعمل | أو أو للدمج بالأو المنطقي" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2583,55 +2485,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "إبحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "إبدء البحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "لم أجد شيء مطابق لِــ ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "وجدتُ {0} مطابقات" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2641,40 +2543,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +msgid "Missing parameter for OR" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +msgid "Missing right parent" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +msgid "Missing operator for NOT" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2683,9 +2585,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2694,7 +2596,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2728,17 +2635,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 -msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 #, java-format msgid "" @@ -2746,5 +2641,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 #, java-format msgid "" @@ -2753,11 +2648,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgid "API Capabilities Violation" msgstr "" @@ -2871,5 +2770,5 @@ msgstr "عيّن {0}={1} لِــ {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2884,5 +2783,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -2980,4 +2879,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3089,5 +3003,5 @@ msgstr "طبّق ؟" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3169,15 +3083,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "ملف إعدادات غير صحيح التكوين في الأسطر {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3186,5 +3100,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3193,5 +3107,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3200,5 +3114,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3207,5 +3121,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3213,5 +3127,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3220,5 +3134,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3227,5 +3141,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3234,5 +3148,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3241,10 +3155,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3252,24 +3166,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "التفضيلات المخزنة على {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "لم أتمكن من تحميل التفضيلات. السبب هو : {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "لم أتمكن من تحميل التفضيلات من الخادم." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3278,5 +3192,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3305,5 +3219,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3325,31 +3239,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "ج." #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "ش." #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "غ." #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "ش." -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3357,5 +3264,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3366,27 +3273,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3394,5 +3301,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3404,5 +3311,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3410,25 +3317,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3436,43 +3343,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "لا يجب على المتغير ''{0}'' أن يكون صفراً" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3480,5 +3399,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3506,10 +3425,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3517,7 +3432,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3532,5 +3447,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3548,146 +3463,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "أمحي العضو ''{0}'' في العلاقة." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "للطريق ''{0}'' أقل من نقطتين." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "دور غير معروف ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "نوع عضو غير معروف لِــ ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "لم أجد طريق \"من\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "لم أجد طريق \"إلى\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "الطريق الداخلية ''{0}''موجودة في الخارج." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "النص" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "خطأ : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "تحذير: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "خامل" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "مُنتقى" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3700,6 +3607,6 @@ msgstr[5] "عقد" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3712,7 +3619,8 @@ msgstr[5] "طرقات" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3725,20 +3633,36 @@ msgstr[5] "علاقة" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "طريق غير مسماة" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "طريق غير كاملة" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "الخلفية" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" +msgstr "" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "النص" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" msgstr "" @@ -3881,5 +3805,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "خط سكة حديد" @@ -3895,7 +3819,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3915,4 +3839,10 @@ msgstr[1] "{0} أعضاء" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3944,6 +3874,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "التناقض" @@ -3957,7 +3887,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4036,74 +3966,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "إسم المستخدم" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "كلمة‌المرور" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "الإستعمال" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "الخيارات" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "أعرض هذه المساعدة" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "عيّن اللغة" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4112,9 +4042,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "أمثال" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4122,36 +4052,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "الملفّ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4166,22 +4096,22 @@ msgstr "حرّر" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "العرض" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "العدة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "التعيينات المسبقة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4189,5 +4119,5 @@ msgstr "اللائحة: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "سمعيّ" @@ -4266,13 +4196,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "الطبقة ليست في اللائحة." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4305,5 +4236,5 @@ msgstr "جاري التهيئة" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4311,6 +4242,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4319,5 +4250,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4326,5 +4257,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4333,25 +4264,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4359,9 +4290,9 @@ msgstr "الدّور" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4393,11 +4324,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4406,6 +4337,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4413,6 +4344,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4420,40 +4351,40 @@ msgstr "الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4461,21 +4392,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4507,22 +4438,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4530,5 +4461,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4536,30 +4467,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4567,5 +4498,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4573,14 +4504,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4588,5 +4519,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4594,23 +4525,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4621,27 +4552,27 @@ msgstr "أزِل" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4650,5 +4581,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4657,5 +4588,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4664,5 +4595,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4671,5 +4602,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4678,5 +4609,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4686,5 +4617,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4919,10 +4850,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4932,10 +4863,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5020,9 +4951,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5030,6 +4961,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "الكلّ" @@ -5118,7 +5049,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5132,6 +5063,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5239,4 +5170,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "امحي الأغراض المختارة." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "غيّر القيم ؟" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "نزّل" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "نزّل معطيات خريطة من الخادم أو.أس.أم" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "يغلق حزمات التغييرات المفتوحة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "إفتح محرر نص للعلاقة المحددة" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5250,12 +5233,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5273,18 +5256,18 @@ msgstr "تكدس الأوامر: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "حلّ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5292,25 +5275,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5322,26 +5305,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5352,41 +5335,41 @@ msgstr "أضِف" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5425,5 +5408,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5438,34 +5421,34 @@ msgstr "إفتح لائحة بكلّ التبقات المحملة." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "أمحي الطبقة المختارة." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "عرض/إخفاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل." @@ -5475,5 +5458,175 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "العلاقات" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "إفتح لائحة بكل العلاقات." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "العلاقات: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "إفتح محرر نص للعلاقة المحددة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "أمحي العلاقة المحددة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "أنشئ علاقة جديدة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "الخيار الحالي" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "إفتح نافذة لائحة خيارات." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "الخيار" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "الخيار: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "أنقر لتكبير/تصغير محتويات اللوحة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "المؤلفين" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "إفتح لائحة بإسم الأشخاص اللذين يعملون على الأغراض المختارة." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "المؤلف" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "رقم الغرض" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "غير كامل" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "طريق مغلقة الدوران" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "جاري تنزيل حزمات تغييرات مفتوحة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5482,22 +5635,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "<مختلف>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "غيّر القيم ؟" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5506,5 +5659,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5513,226 +5666,71 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "الرجاء إختيار مفتاح" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "الرجاء إختيار قيمة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "خصائص/عضويات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "خصائص الأغراض المختارة." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "عضو من" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "أضف صفة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "الخصائص: {0} / العضويات: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "الخصائص/ العضويات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "غيّر العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "أمحي من العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "أمحي المفتاح المنتقى من كلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "أمحي الخصائص" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "حرّر المحتاح المنقى لكلّ الأغراض" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "العلاقات" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "إفتح لائحة بكل العلاقات." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "العلاقات: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "إفتح محرر نص للعلاقة المحددة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "أمحي العلاقة المحددة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "أنشئ علاقة جديدة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "الخيار الحالي" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "إفتح نافذة لائحة خيارات." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "الخيار" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "الخيار: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "أنقر لتكبير/تصغير محتويات اللوحة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "المؤلفين" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "إفتح لائحة بإسم الأشخاص اللذين يعملون على الأغراض المختارة." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "المؤلف" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "رقم الغرض" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5794,18 +5792,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" -msgstr[1] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" -msgstr[2] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" -msgstr[3] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" -msgstr[4] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" -msgstr[5] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "موقع التنزيل" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5828,14 +5821,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "طبّق الخيار المسبق" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "إفتح محرر نص للعلاقة المحددة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5844,14 +5835,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5861,9 +5852,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5873,15 +5864,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5889,5 +5880,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5895,20 +5886,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5917,70 +5908,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "رياضة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5989,9 +5979,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6000,48 +5990,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "نزّل الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6051,34 +6040,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6190,10 +6179,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6203,5 +6192,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6285,9 +6274,4 @@ msgid "Download Area" msgstr "نزّل المساحة" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "نزّل" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6586,6 +6570,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6598,6 +6580,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6868,4 +6848,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7088,5 +7072,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7129,116 +7113,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "الإسم" @@ -7262,15 +7246,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "النوع" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7441,10 +7425,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7452,5 +7436,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7458,9 +7442,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7575,6 +7559,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "مجهول" @@ -7596,13 +7580,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7637,4 +7621,116 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7653,39 +7749,146 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "حمّل التغييرات" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "أغلق حزمات التغييرات المفتوحة" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "إحفظ المستخدم و كلمة المرور (غير معتمة)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "الرجاء إدخال إسم المستخدم" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "تحذير: يتم نقل كلمة المرور بدون تعتيم" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +msgid "Authenticate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "غيّر العلاقة" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7752,17 +7955,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7775,9 +7978,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7791,9 +7994,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7808,50 +8011,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "تجاهل و خروج" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7859,5 +8062,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7930,40 +8133,385 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "Advanced" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +msgid "Configure advanced settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "دور غير معروف ''{0}''." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "حمّل التغييرات" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "معلومات حول" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "الرجاء إختيار مفتاح" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "الأغراض اللتي يجب إضافتها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "الأغراض اللتي يجب تغييرها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "الأغراض اللتي يجب حذفها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7972,5 +8520,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -7979,5 +8527,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -7986,212 +8534,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "حمّل التغييرات" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "الرجاء إدخال الأحداثيات المرغوبة أولاً." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} أمتار" -msgstr[1] "{0} أمتار" -msgstr[2] "{0} أمتار" -msgstr[3] "{0} أمتار" -msgstr[4] "{0} أمتار" -msgstr[5] "{0} أمتار" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "الرجاء إدخال إسم المستخدم" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "نقطة gps" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "إستعمل الإعدادات العامة." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "أرسم خطوط بين النقاط لهذه الطبقة." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "حدد خيارات رسم الخطوط" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8199,5 +8572,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8206,5 +8579,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8286,5 +8659,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "" @@ -8316,10 +8689,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8329,12 +8702,12 @@ "مضرة.
أنظر هنا إذا أردت تحميل بعض الأثرات:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8343,29 +8716,29 @@ msgstr "محوّل من: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "نزّل من أو.أس.أم على طول هذا المسلك" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "نزّل كلّ شيئ بين:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} أمتار" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "المساحة القصوى للمطلب:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} كلم²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8374,9 +8747,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8384,5 +8757,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8390,23 +8763,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "طبقة المعطيات {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "خارج عن المنطقة المنزلة" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8415,5 +8788,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8427,5 +8800,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8438,11 +8811,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8451,36 +8824,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} يتألف من:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8488,5 +8861,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8495,5 +8868,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8505,5 +8878,5 @@ msgstr[5] "نقاط" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8512,5 +8885,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8519,5 +8892,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8530,24 +8903,24 @@ msgstr[5] "{0} نقطة" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "خطء عند تحليل {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "لم أتمكن من قراءة \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8556,34 +8929,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8591,69 +8964,154 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +msgid "Override position for: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "الخيار فارغ !" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8662,9 +9120,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8673,134 +9127,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "جاري قراءة {0}..." +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 +#, java-format +msgid "Unable to get canonical path for directory {0}\n" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 +#, java-format +msgid "Scanning directory {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 -#, java-format -msgid "Scanning directory {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 -#, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8812,52 +9188,98 @@ msgstr[5] "صور" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "لا يمكن العثور عن الملف" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "إعدادات المعراض" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "شغل العلامة السابقة" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "أقلب: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "أمحي من العلاقة" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +msgid "Show next Image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8866,5 +9288,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8964,4 +9386,12 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" @@ -9173,7 +9603,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "" @@ -9242,6 +9671,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "الدراجة" @@ -9628,31 +10057,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "تمكين خادم التوكيل" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "بدون ذكر الإسم" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "نزل" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "الرياضة" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "كلمة‌المرور" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "إعدادات الوكيل" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "مضيف مخدم التوكيل" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "منفذ مخدم التوكيل" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "الإسم على مخدم التوكيل" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "كلمة المرور عند مخدم التوكيل" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "URL الخادم الأساسي" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "كلمة المرور أو.أس.أم" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9932,5 +10420,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9940,13 +10428,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9954,18 +10442,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "ميزات خيارية:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "طريق مغلقة الدوران" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "نوع غير معروف: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9976,16 +10464,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "خطأ في التحليل النحوي {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "العناصر من الفصيلة {0} هي مدعومة" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -9998,18 +10486,18 @@ msgstr[5] "غيّر {0} غرض" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "الخيار فارغ !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "الخيار غير مناسب !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "طبّق الخيار المسبق" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "غيّر الخصائص" @@ -10038,4 +10526,11 @@ msgstr "جاري تحميل النقاط {0} إلى {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10051,12 +10546,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "جاري تحضير المعطيات..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10157,16 +10707,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10176,40 +10726,40 @@ msgstr "جاري تنزيل معطيات أو.أس.أم" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10217,14 +10767,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "جاري تحميل النقاط {0} إلى {1}..." -msgstr[1] "جاري تحميل النقاط {0} إلى {1}..." -msgstr[2] "جاري تحميل النقاط {0} إلى {1}..." -msgstr[3] "جاري تحميل النقاط {0} إلى {1}..." -msgstr[4] "جاري تحميل النقاط {0} إلى {1}..." -msgstr[5] "جاري تحميل النقاط {0} إلى {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10261,14 +10807,14 @@ msgstr "فشل إستيراد NMEA !" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10277,16 +10823,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10294,66 +10840,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "اعداد..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "جاري الإرسال..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "جاري تحضير المعطيات..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "غيّر غرض {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10379,4 +10936,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10388,5 +10955,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10413,5 +10980,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10419,5 +10986,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10430,5 +10997,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10439,57 +11006,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "الإسم أو كلمة المرور خطأ" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "تحذير: يتم نقل كلمة المرور بدون تعتيم" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "إحفظ المستخدم و كلمة المرور (غير معتمة)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "أدخل كلمة المرور" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "دخول" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "URL الخادم الأساسي" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "كلمة المرور أو.أس.أم" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10579,5 +11095,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10586,38 +11109,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10625,19 +11148,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "غرض غير مسموح به معروف بــ id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10647,8 +11170,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10658,25 +11181,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10684,5 +11223,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10691,5 +11230,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10697,5 +11236,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10704,13 +11243,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "حضّر المعطيات أو.أس.أم ..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10733,21 +11272,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "جاري تنزيل حزمات تغييرات مفتوحة" +msgstr[1] "جاري تنزيل حزمات تغييرات مفتوحة" +msgstr[2] "جاري تنزيل حزمات تغييرات مفتوحة" +msgstr[3] "جاري تنزيل حزمات تغييرات مفتوحة" +msgstr[4] "جاري تنزيل حزمات تغييرات مفتوحة" +msgstr[5] "جاري تنزيل حزمات تغييرات مفتوحة" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "جاري تنزيل حزمات تغييرات مفتوحة" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10775,9 +11330,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10836,5 +11387,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10843,4 +11394,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +msgid "Unexpected id 0 for osm primitive found" msgstr "" @@ -10880,7 +11435,7 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "أمحي {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 @@ -11021,9 +11576,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "لا يوجدأي وصف" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11145,4 +11700,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11429,6 +11999,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "" @@ -11514,5 +12084,5 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "" @@ -11523,5 +12093,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "إستيفاء العنوان" @@ -11536,11 +12106,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11551,24 +12118,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "الرقم" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "طبيعي" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "صورة" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "إستئجار سيارة" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11586,7 +12149,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "حرّر الفلق الخارجي" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11699,5 +12261,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11759,21 +12321,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11782,13 +12344,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11813,17 +12375,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "تمكين الإخباء التلقائي" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "حجم الخابية الأقصى (م. بايت)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11835,18 +12397,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11854,5 +12416,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11860,52 +12422,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12107,5 +12666,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12296,5 +12855,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "لم يتم تحميل أي معطيات." @@ -12316,9 +12875,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12704,7 +13263,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "الماء" @@ -12853,19 +13412,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "" @@ -12904,32 +13463,32 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 +msgid "Capture GPS Track" +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +msgid "Connect to gpsd server and show current position in LiveGPS layer." +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 +msgid "Center Once" +msgstr "" + #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 -msgid "Capture GPS Track" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -msgid "Connect to gpsd server and show current position in LiveGPS layer." -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 -msgid "Center Once" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 msgid "Center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "" @@ -12980,9 +13539,9 @@ msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "" @@ -13020,5 +13579,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13029,13 +13588,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13176,5 +13735,5 @@ msgstr "" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13266,5 +13825,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13340,41 +13899,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13543,4 +14102,41 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +msgid "Segments" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "رقم النقطة" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13559,41 +14155,19 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "إسم الشارع" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" msgstr "" @@ -13609,5 +14183,5 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "" @@ -14254,38 +14828,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "" @@ -14299,5 +14843,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "" @@ -14412,10 +14956,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15113,6 +15657,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "" @@ -15558,5 +16102,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "" @@ -15674,5 +16218,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15684,5 +16228,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "غابة/حرش" @@ -15940,4 +16484,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -15969,8 +16516,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "" @@ -16118,9 +16667,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "" @@ -16365,5 +16915,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "" @@ -16398,5 +16948,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "" @@ -16430,6 +16980,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "" @@ -16479,5 +17029,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "" @@ -16665,6 +17215,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "" @@ -16785,5 +17335,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16809,4 +17358,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16816,15 +17366,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "شركة الإدارة" @@ -17036,7 +17586,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "إرتفاع" @@ -17455,5 +18005,5 @@ msgstr "" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17463,5 +18013,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "" @@ -17987,32 +18537,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "أزقات الإفتتاح" @@ -18071,91 +18621,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18170,5 +18720,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18187,7 +18737,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "الرقم المرجعي" @@ -18203,5 +18753,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "تحت الأرض" @@ -18214,6 +18764,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "رسم دخول/إجرة" @@ -18252,22 +18802,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "حرّر متجر سيارات" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "تصليح سيارات" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "حرّر تصليح سيارات" @@ -18275,5 +18813,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "إستئجار سيارة" @@ -18282,10 +18820,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "حرّر إستئجار سيارة" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "مشاركة السيارة" @@ -18293,5 +18831,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "حرّر مشاركة السيارة" @@ -18299,10 +18837,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "حرّر موقف دراجة" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "إستيعاب" @@ -18311,22 +18849,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "حرر إستأجار دراجة" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "حرر مبيع قطع دراجات" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "النقل المشترك" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18336,5 +18867,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18342,5 +18873,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18348,5 +18879,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "موقف قطار" @@ -18354,5 +18885,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "حرّر موقف" @@ -18360,5 +18891,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "موقف ترام" @@ -18367,5 +18898,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "حرر موقف ترام" @@ -18373,5 +18904,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "رصيف محطة القطار" @@ -18380,5 +18911,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "حرّر رصيف محطة القطار" @@ -18390,5 +18921,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18396,10 +18927,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "مساحة" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "مدخل قطار نفقي" @@ -18408,10 +18939,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "حرّر مدخل قطار نفقي" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "مناسب لكرسي المقعدين" @@ -18420,5 +18951,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "محطة حافلة نقل جماعي (باص)" @@ -18427,5 +18958,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "حرّر محطة حافلة نقل جماعي (باص)" @@ -18433,5 +18964,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "موقف محطة حافلة نقل جماعي" @@ -18441,5 +18972,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "حرّر موقفحافلة نقل جماعي (باص)" @@ -18448,17 +18979,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "ملجأ" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "" @@ -18466,5 +19005,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "تاكسي" @@ -18472,5 +19011,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "حرّر موقف تاكسي" @@ -18478,5 +19017,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "مطار" @@ -18484,15 +19023,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "" @@ -18500,10 +19039,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "مكان المبيت" @@ -18515,5 +19054,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "فندق" @@ -18522,15 +19061,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "حرّر فندق" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "النجوم" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "فندق (رخيص)" @@ -18538,20 +19077,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "حرّر فندق (رخيص)" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "بيت ضيافة" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "حرّر بيت ضيافة" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "كوخ" @@ -18559,10 +19098,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "حرّر كوخ" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "نزل" @@ -18570,30 +19109,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "حرّر نزل" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "كوخ جبلي" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "حرّر كوخ جبلي" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "موقع قافلة" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "حرّر موقع قافلة" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "موقع تخييم" @@ -18601,10 +19140,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "حرّر موقع تخييم" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "طعام و شراب" @@ -18615,5 +19154,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "مطعم" @@ -18621,5 +19160,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "حرّر مطعم" @@ -18627,5 +19166,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "الطبخ" @@ -18633,61 +19172,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "إيطالي" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "صيني" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "معجنات إيطالية (بيزا)" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "هامبرغر" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "يوناني" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "ألماني" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "هندي" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "محلي/إقليمي" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "كباب / شورما" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "تركي" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "آسيوي" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "تايلاندي" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "مكسيكي" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "ياباني" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "وجبات سريعة" @@ -18695,9 +19234,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "حرّر مطعم وجبات السريعة" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "مقهى إستراحة" @@ -18705,9 +19244,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "حرّر مقهى إستراحة" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "حانة" @@ -18715,18 +19254,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "حرّر حانة" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "حانة شرب الجعة" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "حرّر حانة شرب الجعة" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "حانة" @@ -18734,9 +19273,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "حرّر حانة" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "نادي سهر / نادي ليلي" @@ -18744,24 +19283,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "حرّر نادي سهر/ نادي ليلي" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "سياحة" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "متحف" @@ -18769,9 +19308,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "حرّر متحف" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "حديقة حيوانات" @@ -18780,9 +19319,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "حرّر حديقة حيوانات" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "موقع كاشف" @@ -18790,24 +19329,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "برج مراقبة" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "أعمال فنية" @@ -18815,5 +19354,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "حرّر أعمال فنية" @@ -18821,19 +19360,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "مكتب إستعلامات" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "الخريطة" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18871,5 +19410,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18877,28 +19416,28 @@ msgstr "شارع" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -18908,5 +19447,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18914,6 +19453,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "ركب الدراجة" @@ -18921,5 +19460,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -18927,6 +19466,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "تزلّج" @@ -18934,5 +19473,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -18940,46 +19479,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "لوحة معلومات" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "التاريخ" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "الطبيعة" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "الحيوانات الضارة" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -18987,29 +19526,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "حرّر ملجأ" @@ -19017,25 +19556,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "موقع تنزه" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "حرّر موقع تنزه" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "مواقع تاريخية" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "قلعة" @@ -19044,19 +19583,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "حرّر قلعة" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "أطلال" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "حرّر أطلال" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "موقع أثري" @@ -19065,9 +19604,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "حرّر موقع أثري" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "ساحة معركة" @@ -19075,10 +19614,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "حرّر ساحة معركة" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19086,5 +19625,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19092,71 +19631,71 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "نصب تذكاري" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "حرّر نصب تذكاري" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" -msgstr "نصب تذكاري" +msgstr "ضريح" #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" -msgstr "حرّر نصب تذكاري" +msgstr "حرّر ضريح" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "ضريح/مزار" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "حرّر مزار/ضريح" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "وقت الفراغ" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "حديقة ألعاب مائية" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "حرّر حديقة ألعاب مائية" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "ملعب" @@ -19164,35 +19703,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "حرّر ملعب" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "صيد السمك" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "حرّر صيد السمك" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "المرافق الرياضية" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "مدرج ألعاب رياضية" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "حرّر مدرج ألعاب رياضية" @@ -19206,6 +19745,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "إختر الرياضة :" @@ -19597,30 +20136,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "الرياضة" @@ -19630,225 +20169,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "متعدد" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "أسلحة الرماية" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "كرة القدم الأوسترالية" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "كرة المضرب" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "كرة السلّة" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "التسلق" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "ركوب الدراجة" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "سبق الكلاب" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "ركوب الخيل" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "الجمباز" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "سبق الخيل" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "رياضة المحركات" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "التزلج" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "كرة القدم" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "السباحة" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "تنس الطاولة" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "التنس" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "مركز/نادي رياضي" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "حرّر مركز/نادي رياضي" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "رياضة" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "متعدد" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -19887,21 +20426,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "النوع" @@ -19940,203 +20479,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "مركز/نادي رياضي" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "مدرج ألعاب رياضية" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" +#: build/trans_presets.java:1942 +msgid "Edit 10pin" +msgstr "" + +#: build/trans_presets.java:1947 +msgid "Athletics" +msgstr "" + +#. item "Sport/Athletics" +#: build/trans_presets.java:1948 +msgid "Edit Athletics" +msgstr "" + #: build/trans_presets.java:1953 -msgid "Edit 10pin" -msgstr "" - -#: build/trans_presets.java:1958 -msgid "Athletics" -msgstr "" - -#. item "Sport/Athletics" -#: build/trans_presets.java:1959 -msgid "Edit Athletics" -msgstr "" - -#: build/trans_presets.java:1964 msgid "Archery" msgstr "سلاح الرامي" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "حرّر سلاح الرامي" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "تسلق" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "حرّر تسلق" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "غدف" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "حرّر غدف" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "حرّر ركب الدراجة" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "سباق الكلاب" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "حرّر سباق الكلاب" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "فروسي" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "حرّر فروسي" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "سباق الخيل" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "حرّر سباق الخيل" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "رياضة بدنية" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "حرّر رياضة بدنية" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "رياضة المحركات" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "حرّر رياضة المحركات" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "تزحلق" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "حرّر تزحلق" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "سباحة" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "حرّر سباحة" @@ -20144,56 +20683,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "حرّر تزلّج" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "نزولاً" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "شمالي" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "الصعوبة" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "مبتدئ" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "سهل" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "خبير" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "رماية" @@ -20201,182 +20740,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "حرّر رماية" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "رياضة (كرة)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "كرة القدم" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "حرّر كرة القدم" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "" #. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2056 +msgid "Edit Australian Football" +msgstr "" + +#: build/trans_presets.java:2061 +msgid "Baseball" +msgstr "" + +#. item "Sport (Ball)/Baseball" +#: build/trans_presets.java:2062 +msgid "Edit Baseball" +msgstr "" + #: build/trans_presets.java:2067 -msgid "Edit Australian Football" -msgstr "" - -#: build/trans_presets.java:2072 -msgid "Baseball" -msgstr "" - -#. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 -msgid "Edit Baseball" -msgstr "" - -#: build/trans_presets.java:2078 msgid "Basketball" msgstr "كرة السلّة" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "حرّر كرة السلّة" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "" #. item "Sport (Ball)/Golf" +#: build/trans_presets.java:2074 +msgid "Edit Golf" +msgstr "" + +#. item "Sport (Ball)/Golf" combo "type" +#: build/trans_presets.java:2077 +msgid "golf_course" +msgstr "" + +#: build/trans_presets.java:2079 +msgid "Boule" +msgstr "" + +#. item "Sport (Ball)/Boule" +#: build/trans_presets.java:2080 +msgid "Edit Boule" +msgstr "" + #: build/trans_presets.java:2085 -msgid "Edit Golf" -msgstr "" - -#. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 -msgid "golf_course" -msgstr "" - -#: build/trans_presets.java:2090 -msgid "Boule" -msgstr "" - -#. item "Sport (Ball)/Boule" +msgid "Bowls" +msgstr "" + +#. item "Sport (Ball)/Bowls" +#: build/trans_presets.java:2086 +msgid "Edit Bowls" +msgstr "" + #: build/trans_presets.java:2091 -msgid "Edit Boule" -msgstr "" - -#: build/trans_presets.java:2096 -msgid "Bowls" -msgstr "" - -#. item "Sport (Ball)/Bowls" +msgid "Cricket" +msgstr "" + +#. item "Sport (Ball)/Cricket" +#: build/trans_presets.java:2092 +msgid "Edit Cricket" +msgstr "" + #: build/trans_presets.java:2097 -msgid "Edit Bowls" -msgstr "" - -#: build/trans_presets.java:2102 -msgid "Cricket" -msgstr "" - -#. item "Sport (Ball)/Cricket" +msgid "Cricket Nets" +msgstr "" + +#. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + #: build/trans_presets.java:2103 -msgid "Edit Cricket" -msgstr "" - -#: build/trans_presets.java:2108 -msgid "Cricket Nets" -msgstr "" - -#. item "Sport (Ball)/Cricket Nets" +msgid "Croquet" +msgstr "" + +#. item "Sport (Ball)/Croquet" +#: build/trans_presets.java:2104 +msgid "Edit Croquet" +msgstr "" + #: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 -msgid "Croquet" -msgstr "" - -#. item "Sport (Ball)/Croquet" +msgid "Hockey" +msgstr "" + +#. item "Sport (Ball)/Hockey" +#: build/trans_presets.java:2110 +msgid "Edit Hockey" +msgstr "" + #: build/trans_presets.java:2115 -msgid "Edit Croquet" -msgstr "" - -#: build/trans_presets.java:2120 -msgid "Hockey" -msgstr "" - -#. item "Sport (Ball)/Hockey" +msgid "Pelota" +msgstr "" + +#. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + #: build/trans_presets.java:2121 -msgid "Edit Hockey" -msgstr "" - -#: build/trans_presets.java:2126 -msgid "Pelota" -msgstr "" - -#. item "Sport (Ball)/Pelota" +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" +msgid "Rugby" +msgstr "" + +#. item "Sport (Ball)/Rugby" +#: build/trans_presets.java:2128 +msgid "Edit Rugby" +msgstr "" + #: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2144 msgid "Table Tennis" msgstr "تنس الطاولة" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "حرّر تنس الطاولة" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "تنس" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "حرّر تنس" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "مباني" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "مبنى" @@ -20384,5 +20923,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "مبنى عام" @@ -20390,10 +20929,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "حرّر مبنى عام" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "مبنى البلدية" @@ -20401,10 +20940,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "حرّر مبنى البلدية" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "سفارة" @@ -20412,10 +20951,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "حرّر سفارة" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "محكمة" @@ -20424,10 +20963,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "حرّر محكمة" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "سجن" @@ -20436,10 +20975,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "حرّر سجن" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "شرطة" @@ -20449,10 +20988,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "حرّر شرطة" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "فوج إطفاء" @@ -20461,10 +21000,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "حرّر فوج إطفاء" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "مكتب البريد" @@ -20472,5 +21011,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "حرّر مكتب البريد" @@ -20478,15 +21017,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "حضانة أطفال" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "حرّر حضانة أطفال" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "مدرسة" @@ -20494,10 +21033,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "حرّر مدرسة" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "جامعة" @@ -20505,10 +21044,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "حرّر جامعة" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "كلّية" @@ -20516,5 +21055,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "حرّر كلّية" @@ -20522,5 +21061,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "سينما" @@ -20529,10 +21068,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "حرّر سينما" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "مكتبة" @@ -20541,9 +21080,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "حرّر مكتبة" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "مركز ثقافي" @@ -20551,10 +21090,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "حرّر مركز ثقافي" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "مسرح" @@ -20563,10 +21102,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "حرّر مسرح" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "معبد" @@ -20576,5 +21115,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "حرّر معبد" @@ -20583,6 +21122,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "الديانة" @@ -20591,66 +21130,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "بهائي" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "بوذي" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "نصراني" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "هندوس" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "يهودي" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "مسلم" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "سيخ" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "روحاني" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "الطقوس الدينية" @@ -20659,81 +21198,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "معمداني" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "كثليك" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "إنجيلي" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "شهود يهوه" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "لوثري" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "منهجي" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "أرثدكس" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "بروتستاني" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "شيعي" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "سنّي" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "عناوين" @@ -20742,5 +21281,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "حرّر معلومات عنوان" @@ -20748,5 +21287,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "رقم المنزل" @@ -20754,20 +21293,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "تسمية المنزل" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "إسم الشارع" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "إسم المدينة" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "الرمز البريدي" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "رمز البلد" @@ -20776,5 +21320,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "حرّر إستيفاء العنوان" @@ -20782,61 +21326,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "مخطط الترقيم" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "مفرد" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "مثنى" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "من صنع الإنسان" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "المصانع" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "حرّر المصانع" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "برج" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "حرّر برج" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20844,25 +21388,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "خزان / برج مياه" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "حرّر خزان/برج مياه" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "خزان محروقات" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "حرّر خزان المحروقات" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "منارة" @@ -20870,10 +21414,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "حرّر منارة" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "طاحونة هوائية" @@ -20881,10 +21425,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "حرّر طاحونة هوائية" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "خط أنابيب" @@ -20893,37 +21437,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "حرّر خط أنابيب" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "غاز" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "محطّة تكرير مياه" @@ -20933,10 +21477,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "حرّر محطّة تكرير مياه" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "ونش" @@ -20944,10 +21488,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "حرّر ونش" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "عمود إضائة" @@ -20955,10 +21499,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "حرّر عمود إضاءة" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "نقطة رؤية" @@ -20966,10 +21510,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "حرّر نقطة رؤية" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "مراقبة" @@ -20977,5 +21521,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "حرّر كامرة مراقبة" @@ -20983,5 +21527,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "مولد طاقة" @@ -20991,35 +21535,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "حرّر مولد طاقة" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "أرياح" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "مائية" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "طاقة أحفورية" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "نووية" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "فحم" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "كهرباء شمسية" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "محطة توليد طاقة" @@ -21028,10 +21572,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "حرّر محطة توليد طاقة" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "محطة طاقة فرعية" @@ -21040,5 +21584,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "حرّر محطة طاقة فرعية" @@ -21046,10 +21590,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "رقم الخط" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "عمود كهربائي" @@ -21060,23 +21604,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "حرّر عمود كهربائي" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "سلك/خط كهربائي" @@ -21085,75 +21629,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "حرّر عمود كهربائي" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "التوتر" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "خدمات/نافعات" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "مراحيض" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "الملاحظة" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "صندوق بريد" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "هاتف" @@ -21162,5 +21706,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "حرّر هاتف" @@ -21168,5 +21712,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "عملات معدنية" @@ -21174,5 +21718,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "الملاحظات" @@ -21180,5 +21724,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21186,5 +21730,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "" @@ -21192,15 +21736,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "بطاقات إعتماد" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "بطاقات هاتفية" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "إعادة تصنيع الأشياء" @@ -21209,5 +21753,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "حرّر إعادة تصنيع الأشياء" @@ -21215,36 +21759,31 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "بطاريات" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "علب (معدنية)" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "ملابس" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "زجاج" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "ورق" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" -msgstr "" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" msgstr "" @@ -21252,31 +21791,31 @@ #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21347,39 +21886,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "خضار" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "" @@ -21388,30 +21927,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "الإرتفاع" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "منخفض" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "نصف" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "ملء" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "مخبئ" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "نافورة" @@ -21420,10 +21959,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "حرّر نافورة" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "ماء شفة" @@ -21432,10 +21971,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "حرّر ماء شفة" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21443,33 +21982,56 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "مَتاجر/دكاكين" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "حرّر متجر سيارات" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +msgid "Bike Dealer" +msgstr "" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "حرر مبيع قطع دراجات" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "سوبرماركت" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "حرّر سوبرماركت" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "" @@ -21477,9 +22039,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "كشك" @@ -21487,27 +22049,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "حرّر كشك" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "آلة بيع" @@ -21515,5 +22077,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "" @@ -21521,88 +22083,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "نوعية المبيعات" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "تذاكر_النقل_العام" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "خرائط_النقل_العام" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "تذاكر_موقف_سيارات" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "مأكولات" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "مشروبات" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "حلويات" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "سجائر" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "صور" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "مأكولات للحيوانات" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "جرائد" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "ألعاب" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "طوابع" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "رقائق SIM" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "قسائم تعبئة هاتفية" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "قسائم" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "مانع الحمل" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "سدادات قطنية" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "جزار" @@ -21610,9 +22172,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "حرّر جزار" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "خباز" @@ -21620,9 +22182,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "حرّر خباز" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "بائع الزهور" @@ -21630,18 +22192,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "حرّر بائع الزهور" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "مأكولات عضوية" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "حرّر مبيع مأكولات عضوية" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21649,54 +22211,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "مشروبات" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "حاسوب" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "حرّر مبيع قطع حاسوب" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "إلكترونيات" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "حرّر إلكترونيات" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "حرّر مبيع Hifi" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "أثاث/فرش" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "حرّر مبيع فرش/أثاث" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "" @@ -21704,9 +22266,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "خردوات/أدوات منزلية" @@ -21714,9 +22276,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "حرّر مخزن خردوات/أدوات منزلية" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "" @@ -21724,54 +22286,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "قرطاسية" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "حرّر مبيع قرطاسية" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "حلاق" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "حرّر حلاق" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "أحذية" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "حرّر أحذية" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "ألعاب" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "حرّر مبيع ألعاب" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "مرئيّات" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "حرّر مبيع مرئيّات" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "تنظيف جاف" @@ -21779,9 +22341,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "حرّر تنظيف جاف" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "مصبغة/غسيل" @@ -21789,9 +22351,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "حرّر مصبغة/غسيل" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "نشاطات في الخلاء" @@ -21799,28 +22361,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "حرّر متجر نشاطات في الخلاء" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "حرّرمبيع لوازم للأنشطة رياضية" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "حرّر نظاراتي" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "نقود/أموال" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "مصرف" @@ -21828,14 +22390,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "حرّر مصرف" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "صرّاف آلي" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "صرّاف" @@ -21843,5 +22405,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "حرّر صرّاف" @@ -21849,15 +22411,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "حرّر صراف آلي" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "صحة" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "أطباء" @@ -21865,18 +22427,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "حرّر أطباء" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "طبيب أسنان" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "حرّر طبيب أسنان" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "صيدلية" @@ -21884,5 +22446,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "حرّر صيدلية" @@ -21890,9 +22452,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "مستشفى" @@ -21900,10 +22462,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "حرّر مستشفى" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "نقطة دخول طوارئ" @@ -21912,5 +22474,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "حرّر نقطة دخول طوارئ" @@ -21919,20 +22481,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "رقم النقطة" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "إسم النقطة" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "رقم الهاتف" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "إستعمل رمز دولي مثل 12-345-67890" @@ -21940,5 +22502,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "بيطري" @@ -21947,64 +22509,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "حرّر بيطري" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "الأماكن" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "قارة" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "حرّر قارة" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "وطن" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "حرّر وطن" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "دولة/ولاية" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "حرّر دولة/ولاية" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "قطر/منطقة" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "حرّر قطر/منطقة" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "" @@ -22012,15 +22574,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "مدينة" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "حرّر مدينة" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "بلدة" @@ -22028,10 +22590,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "حرّر بلدة" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "ضاحية" @@ -22039,25 +22601,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "حرّر ضاحية" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "قرية" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "حرّر قرية" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "قرية صغيرة" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "حرّر قرية صغيرة" @@ -22065,5 +22627,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "محلة" @@ -22071,10 +22633,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "حرّر محلة" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "جزيرة" @@ -22082,10 +22644,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "حرّر جزيرة" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22093,5 +22655,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22099,5 +22661,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "مدخل كهف" @@ -22105,10 +22667,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "حرّر مدخل كهف" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "قمّة" @@ -22116,10 +22678,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "حرّر قمّة" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "جليد" @@ -22127,10 +22689,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "حرّر جليد" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "بركان" @@ -22138,70 +22700,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "حرّر بركان" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "الحدود" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "دولية" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "حرّر حدود دولية" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "إدارية" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "حرّر حدود إدارية" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "مدنية" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "حرّر حدود إدارية" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "حرّر الحدود السياسية" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "محمية وطنية (بيئية)" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "حرّر محمية وطنية (التنوع البيئي)" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "إستعمال الأرض" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "شجرة" @@ -22210,15 +22772,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "حرّر شجرة" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "حرّر اإسم النباتي" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "حرج" @@ -22227,5 +22789,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "حرّر حرج" @@ -22233,17 +22795,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "صنوبري الثمر" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "مختلط" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "غابة" @@ -22252,14 +22814,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "حرّر غابة" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "محمية طبيعية" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "حرّر محمية طبيعية" @@ -22267,25 +22829,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "حصاة" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "حرّر حصاة" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "أشجار منخفضة" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "حرّر أشجار منخفضة" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22293,10 +22855,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "هوّة" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "" @@ -22304,5 +22866,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "حرّر أرض بور" @@ -22310,5 +22872,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "فناء مزرعة" @@ -22317,45 +22879,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "حرّر فناء مزرعة" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "أرض زراعية" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "حرّر أرض زراعية" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "مرج" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "حرّر مرج" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "كرم عنب" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "حرّر كرم عنب" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "حصص سكنية" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "حرّر حصص سكنية" @@ -22363,25 +22925,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "حديقة" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "حرّر حديقة" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "عشب" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22389,10 +22951,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "شائع" @@ -22400,20 +22962,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "حرّر شائع" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "متنزه" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "حرّر متنزه" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "ميدان ألعاب" @@ -22421,5 +22983,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "حرّر ميدان ألعاب" @@ -22427,15 +22989,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "منطقة سكنية" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "حرّر منطقة سكنية" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "مقبرة" @@ -22443,9 +23005,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "حرّر مقبرة" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "مقبرة" @@ -22453,39 +23015,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "حرّر إستعمال الأرض كمقبرة" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "بيع بلمفرق" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "حرّر بيع بلمفرق" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "تجاري" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "حرّر إستعمال تجاري للأرض" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "صناعي" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "حرّر الإستعمال الصناعي" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "أرض سكة حديد" @@ -22493,15 +23055,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "حرّر أرض سكة حديد" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "عسكري" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "حرّر الإستخدام العسكري للأرض" @@ -22509,55 +23071,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "موقع ورشة إعمار" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "حرّر موقع ورشة إعمار" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "حقل أخضر" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "حرّر إستعمال الأرض كحقل أخضر" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "مطمر نفايات" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "حرّر مطمر نفايات" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "كسّارة، مقلع حجارة" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "حرّر كسّارة / مقلع حجارة" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "متعدد الضلوع" @@ -22567,5 +23129,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "حرّر متعدد الضلوع" @@ -22574,10 +23136,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "الفلق الخارجي" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "حرّر الفلق الخارجي" @@ -22585,5 +23147,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "حصر الإنعطاف" @@ -22592,5 +23154,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "حرّر حصر الإنعطاف" @@ -22598,34 +23160,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "حصر" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "إنعطاف_يسار_ممنوع" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "إنعطاف_يمين_ممنوع" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "على_الطول_ممنوع" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "رجوع_ممنوع" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "إنعطاف_يميني_فقط" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "إنعطاف_يسار_ممنوع" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "على_الطول_فقط" @@ -22634,15 +23196,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "من الطريق" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "مروراً بلعقدة أو الطريق" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "إلى الطريق" @@ -22650,5 +23212,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "الطريق" @@ -22657,5 +23219,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "حرّر طريق" @@ -22663,5 +23225,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "نوع الطريق" @@ -22733,24 +23295,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "حافلة (باص)" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "الطريق" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "عبارة بحرية" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22803,5 +23365,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22810,13 +23372,13 @@ msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "ترام" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -22830,10 +23392,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "وصف الرمز" @@ -22841,31 +23403,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "الشبكة" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "المقترح" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "البديل" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "المؤقت" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "الإتصال" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "اللون (hex)" @@ -22874,30 +23436,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "فلق الطريق" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "الفلق الأمامي" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "الفلق الخلفي" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "نقطة التوقف" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "نقطة التوقف الأمامية" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "نقطة التوقف الخلفية" @@ -23108,130 +23670,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23248,98 +23684,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "مهجور" @@ -23716,7 +24061,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23780,13 +24125,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "سكة حديد" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23802,5 +24226,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23814,5 +24238,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23833,5 +24257,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "مستديرة دوران" @@ -23846,5 +24270,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23859,5 +24283,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "شاطئ نهر" @@ -23871,5 +24295,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "جدول نهر" @@ -23883,5 +24307,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "حوض سفن" @@ -23903,16 +24327,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "قنة جر" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24009,4 +24421,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24075,13 +24494,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "من صنع الإنسان" @@ -24127,6 +24546,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24143,7 +24562,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24166,10 +24585,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24205,11 +24624,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "سكة حديد قديمة" #. color rail +#. #. 1 #. 50000 @@ -24250,6 +24670,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24263,5 +24683,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "" @@ -24283,5 +24703,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24295,5 +24715,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24301,4 +24721,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24348,7 +24775,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "خط جوي" @@ -24365,5 +24792,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24378,5 +24805,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24391,5 +24818,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24404,5 +24831,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24417,5 +24844,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24430,5 +24857,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24548,11 +24975,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "طاقة" @@ -24566,5 +24993,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "رصيف ميناء" @@ -24578,5 +25005,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "خط أنابيب" @@ -24704,12 +25131,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "وقت الفراغ" @@ -24723,5 +25167,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "مارينا" @@ -24759,4 +25203,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24775,4 +25235,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24793,8 +25261,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -24896,10 +25366,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25153,5 +25623,5 @@ #. #. -#. +#. #. color health #. @@ -25297,4 +25767,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25314,23 +25792,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25362,6 +25840,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25422,14 +25900,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "صحة" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25776,5 +26254,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25797,5 +26274,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "متجر/دكان" @@ -25867,8 +26345,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "فندق" @@ -25969,9 +26447,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "سياحة" @@ -26059,9 +26537,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "تاريخي" @@ -26075,5 +26553,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "كسارة / مقلع حجارة" @@ -26087,5 +26565,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26107,5 +26585,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "حوض" @@ -26119,5 +26597,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "غابة" @@ -26131,5 +26609,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "فناء مزرعة" @@ -26152,5 +26630,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "بيع بلمفرق" @@ -26164,5 +26642,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "صناعي" @@ -26176,5 +26654,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26188,5 +26666,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "حقل خضار" @@ -26200,5 +26678,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26255,7 +26733,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "عسكري" @@ -26269,5 +26747,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "مقبرة/جبانة" @@ -26280,5 +26758,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "قمّة" @@ -26293,5 +26771,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "نهر الجليد" @@ -26305,5 +26783,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "بركان" @@ -26358,8 +26836,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "طبيعي" @@ -26373,5 +26851,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "أشجار منخفضة" @@ -26385,5 +26863,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "أرض بور" @@ -26397,5 +26875,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26409,5 +26887,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "طين" @@ -26421,5 +26899,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "شاطئ" @@ -26497,8 +26975,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "طريق" @@ -26546,7 +27024,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "الحدود" @@ -26696,11 +27174,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "المكان" @@ -26748,6 +27226,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "العنوان" @@ -27103,27 +27581,39 @@ msgstr "" -#~ msgid "Images for {0}" -#~ msgstr "الصول لِــ {0}" - -#~ msgid "Read GPX..." -#~ msgstr "إقرءGPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "لا توقيت للنقطة {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}" - -#~ msgid "current delta: {0}s" -#~ msgstr "الإنحراف الحالي: {0}ث" - -#~ msgid "timezone difference: " -#~ msgstr "إختلاف في التوقيت الجغرافي: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} من ضمن المسلك." - -#~ msgid "Image" -#~ msgstr "الصورة" +#~ msgid "Enable proxy server" +#~ msgstr "تمكين خادم التوكيل" + +#~ msgid "Anonymous" +#~ msgstr "بدون ذكر الإسم" + +#~ msgid "Proxy server host" +#~ msgstr "مضيف مخدم التوكيل" + +#~ msgid "Proxy server port" +#~ msgstr "منفذ مخدم التوكيل" + +#~ msgid "Proxy server username" +#~ msgstr "الإسم على مخدم التوكيل" + +#~ msgid "Proxy server password" +#~ msgstr "كلمة المرور عند مخدم التوكيل" + +#~ msgid "Preparing..." +#~ msgstr "اعداد..." + +#~ msgid "Uploading..." +#~ msgstr "جاري الإرسال..." + +#~ msgid "Incorrect password or username." +#~ msgstr "الإسم أو كلمة المرور خطأ" + +#~ msgid "Enter Password" +#~ msgstr "أدخل كلمة المرور" + +#~ msgid "Login" +#~ msgstr "دخول" + +#~ msgid "aqueduct" +#~ msgstr "قنة جر" #~ msgid "Unknown version" @@ -27262,4 +27752,22 @@ #~ msgstr "التناقضات: {0}" +#~ msgid "Images for {0}" +#~ msgstr "الصول لِــ {0}" + +#~ msgid "Read GPX..." +#~ msgstr "إقرءGPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "لا توقيت للنقطة {0} x {1}" + +#~ msgid "timezone difference: " +#~ msgstr "إختلاف في التوقيت الجغرافي: " + +#~ msgid "Image" +#~ msgstr "الصورة" + +#~ msgid "{0} within the track." +#~ msgstr "{0} من ضمن المسلك." + #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -27294,4 +27802,10 @@ #~ msgid "Relation Editor: {0}" #~ msgstr "محرّر العلاقات: {0}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}" + +#~ msgid "current delta: {0}s" +#~ msgstr "الإنحراف الحالي: {0}ث" #~ msgid "Conflicting relation" @@ -27405,7 +27919,4 @@ #~ msgid "Charge" #~ msgstr "رسم الدخول / الإستعمال" - -#~ msgid "File could not be found." -#~ msgstr "لا يمكن العثور عن الملف" #~ msgid "Unsaved Changes" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 19198) +++ /applications/editors/josm/i18n/po/bg.po (revision 19199) @@ -4,11 +4,12 @@ # FIRST AUTHOR , 2009. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-17 18:01+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-08 15:28+0000\n" +"Last-Translator: LandShark \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Създаване на интерфейса" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Помощ" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнориране на неправилна препратка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,18 +95,8 @@ msgstr "Внимание" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнориране неправилен адрес на файл: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"Невъзможно четенето от файла ''{0}''.
Грешката е:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -113,8 +104,18 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"Невъзможно четенето от файла ''{0}''.
Грешката е:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -122,10 +123,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -137,9 +138,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -148,6 +150,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -202,8 +204,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -271,5 +273,5 @@ msgstr "За JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -281,5 +283,5 @@ "невъзможно. Базовият адрес на API е: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -290,5 +292,5 @@ "страница на OSM-потребителя невъзможно. Базовият API адрес: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -297,15 +299,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Продължи" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -314,29 +321,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -353,5 +361,9 @@ msgstr "Отмяна" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Моля, изберете поне една качена вече точка, линия или връзка." @@ -367,5 +379,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Обединение" @@ -385,15 +397,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Добавяне на точка..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Добавяне на точка чрез въвеждане на нейната широчина и дължина." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -409,22 +421,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Редактиране: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Въведете координати за новата точка." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Използване на десетични градуси." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Отрицателни стойности обозначават западното/южното полукълбо" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -433,5 +445,5 @@ msgstr "Географска ширина:" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -440,28 +452,29 @@ msgstr "Географска дължина:" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -473,9 +486,9 @@ msgstr "ОК" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -496,18 +509,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -519,5 +532,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -539,6 +552,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -585,5 +598,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "конфликт" @@ -620,14 +633,15 @@ msgstr "Няма конфликти за показване." -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Затваряне на отворени пакети с промени" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Затваря отворени пакети с промени" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -637,21 +651,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Файл: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Няма отворени пакети с промени" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Няма отворени пакети с промени" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Зареждане на отворени пакети с изменения" @@ -736,11 +750,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -819,16 +834,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -864,5 +884,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Дублиране" @@ -893,23 +913,23 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Преглед на цял екран" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Превключване режима на цял екран" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 msgid "Toggle Fullscreen view" -msgstr "" +msgstr "Превключване режима на цял екран" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Експорт до GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Експорт на данните до GPX файл." @@ -924,12 +944,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -954,8 +974,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -966,10 +986,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -982,17 +1002,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1029,22 +1049,27 @@ msgstr "Показва информация за OSM точки, пътища или връзки." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Свържи препокриващи се Области" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Свързване на области, които се препокриват една с друга" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Моля, изберете поне един затворен път който да бъде присъединен." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Само до две области могат да бъдат свързани към момента." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" не е затворен и съответно не може да бъде съединен." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1058,38 +1083,34 @@ "Сигурни ли сте че искате да продължите?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Моля откажете се, ако не сте сигурни" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Моля, изберете поне един затворен път който да бъде присъединен." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "Няма намерено пресичане. Няма направени промени." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Добавен възел на всички кръстовища" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Изтриване Пътища, които не са част от вътрешен мултиполигон" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Поправяне на релации" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Свързана само-пресичаща се област" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Свързана пресичаща област" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1099,33 +1120,33 @@ "проверете дали няма да се появят грешки." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Въведете стойности за всички конфликти." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Разрешаване на конфликти" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Поправяне конфликти маркери" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Премахнати елементи от връзки" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Присъедини области: премахване на кратки пътища" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Затворен Път" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Премахване на маркери от вътрешни пътища" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Функция свързване на области" @@ -1289,5 +1310,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Невъзможно да се премества обектите извън границите на света." @@ -1367,29 +1388,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Ортогонализиране" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" "Преместване на точките, така че аглите между линиите да са 90 или 270 градуса" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1398,9 +1419,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1412,16 +1433,16 @@ "избягване на това предупреждение.
Ще продължите ли?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Ортогонализиране" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Използване" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Ортогонализиране" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1494,18 +1515,18 @@ msgstr "Невъзможно преименуването на файла ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Промяна посоката на линиите" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Обръща посоката на линиите на всички избрани пътища." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Моля, изберете поне една линия." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Промяна посоката на линиите" @@ -1514,10 +1535,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Запазване" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Запазване на текущите данни." @@ -1574,10 +1595,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Запазване като…" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Записване на текущите данни в нов файл." @@ -1622,6 +1643,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1655,5 +1675,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1720,5 +1740,5 @@ "средата на пътя.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1728,5 +1748,5 @@ "
Трябва да го проверите и коригирате ако е необходимо." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1736,5 +1756,5 @@ "го проверите и коригирате ако е необходимо." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1768,40 +1788,40 @@ msgstr "Тази точка не е свързана с към нещо друго." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Никой от тези точки не са прикрепени за нещо друго." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Нито една от тези тези линии не е прикрепена за други" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Текущато избраните обекти не може да се разсъединят." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Изберете един от вариантите:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Един маркиран възел, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Една точка, която се използва от няколко линии, или" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* Една точка, която се използва от няколко линии и една от тези линии, или" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* Една точка, която се използва от няколко линии и една от тези линии, или" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Една линия, която има точки, които се използват от няколко линии, или" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Една линия, която има точки, които се използват от няколко линии, или" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1810,5 +1830,5 @@ "няколко линии." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1821,9 +1841,9 @@ "дублирани възли и всички възли ще бъдат избрани." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Незапелен възел" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1831,5 +1851,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1864,10 +1884,10 @@ msgstr "Размаркиране всичко (escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Обновяване на данните" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1875,53 +1895,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Няма открит текущ набор от данни" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "Обновява избраните обекти от сървъра (сваляне отново на данните)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Обновява избраното" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Няма нищо избрано." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Качване на данни" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1932,5 +1948,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1938,144 +1954,7 @@ msgstr "Няма промени за качване." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Нищо за качване. Първо създайте някакви данни." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "Синхронизиране само на възел {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "Синхронизиране само на пътя {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Синхронизиране само на релацията {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Синхронизиране на целия набор данни" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"Качването се провали понеже на сървъра има по-нова " -"версия на един
от вашите възли, пътища или релации.
Причина за " -"конфликта се явява {0} с id {1},
версия " -"на сървъра {2}, а ваша версия {3}.

Натиснете {4} за " -"да синхронизирате само конфликтните примитиви.
Натиснете {5} за да синхронизирате целия локален набор данни с сървъра." -"
Натиснете {6} за да прекратите и продължите " -"редактирането.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Забелязани са конфликти" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Качването неуспешно защото сървърът има по-нова " -"версия
на някой от вашите възли, пътища, или отношения.

Кликнете " -"{0} за да синхронизирате цялата база данни със сървъра." -"
Кликнете {1} за отказ и продължаване на редакциите." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Пакета с изменения е затворен" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Обновяване на примитива." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Качване на данни за слой ''{0}''" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2210,9 +2089,9 @@ msgstr "Свалени GPX данни" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Сваляне на данни" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2221,5 +2100,5 @@ "Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "В тази зона няма намерени данни" @@ -2290,7 +2169,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2308,58 +2187,52 @@ "обекти, към които има обръщение." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Рисуване" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Рисуване на точки" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Режим: Рисуване Фокус" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "избран" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Не може да се добави точка извън пределите на света." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Добавяне на точка" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Добавяне на точка в път" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Свързване на съществуващ път към точка" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Добавяне на нова точка към съществуващ път" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Добавяне на точка към път и съединяване" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Създаване нов възел." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Избиране на точката под курсора." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2368,14 +2241,14 @@ msgstr[1] "Вмъкване на нов възел в {0} пътя." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Започване на нов път от последния възел." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Продължаване на път от последния възел." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Завършване на чертането." @@ -2418,18 +2291,19 @@ "тази точка." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Избиране" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Избиране, преместване и завъртане на обекти" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2438,17 +2312,17 @@ msgstr[1] "Добавяне и преместване на виртуален нов възел към {0} пътя" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Преместване на елементи" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Премести" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Отмени преместването" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2458,13 +2332,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Винаги да се премества и този прозорец да не се показва повече" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2473,9 +2347,9 @@ "най-близката точка." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Отпуснете бутона на мишката за да спрете въртенето." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2487,5 +2361,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Мащаб" @@ -2510,5 +2384,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Търсене на обекти." @@ -2598,7 +2472,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - всички обекти, променени от зададения потребител" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2607,8 +2480,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - обекти с дадено количество възели / точки" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:... - обекти с дадено количество възели / точки" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2616,21 +2499,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - всички променени обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - всички избрани обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - всички непълни обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - всички немаркирани обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2638,5 +2527,5 @@ "child израз - всички обекти наследници, отговарящи на израза" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2644,9 +2533,9 @@ "parent израз - всички родители на обектите отговарящи на израза" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Използвайте | или OR за да обедините в логическо \"ИЛИ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2654,11 +2543,11 @@ "ключ съдържа двоеточие)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Използвайте ( и ) за да групирате изрази" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2666,55 +2555,55 @@ msgstr "Филтър" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Търсене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "Приемане на филтър" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Стартиране търсене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Не е намерено съвпадение за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Намерени са {0} съвпадения" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2728,5 +2617,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2734,10 +2623,10 @@ "ключ=стойност." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Синтактична грешка: Шаблонът {0} в {1} е недопустим!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2746,26 +2635,29 @@ "връзка." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Неочакван знак: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Липсват параметри за \"ИЛИ\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Липсват параметри за \"НЕ\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Липсва затваряща скоба." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Липсват параметри за \"ИЛИ\"." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2774,9 +2666,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Грешен брой параметри на оператора за точки." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2787,7 +2679,12 @@ "числова стойност, възел или диапазон, например, 10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Некоректна стойност на id оператора: {0}. Очаквано е число." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Некоректна стойност на id оператора: {0}. Очаквано е число." @@ -2821,43 +2718,29 @@ msgstr "Грешка по време на връзката със сървъра." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Текущият брой на промените надхвърля максималния. Текущ брой - {0}, " -"максимален - {1}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Нарушение на предсъстоянието." + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "{0} брой точки в линия {1} - превишават допустимия брой точки {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Превишаване възможностите на API" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Предупреждение: автоматически е премахнат етикета ''{0}'' на изтрития " -"примитив {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"Дължината на стойността за етикет ''{0}'' на примитива {1} превишава " -"максимално позволената дължина {2}. Дължината на стойностите е {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Нарушение на предсъстоянието." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "{0} брой точки в линия {1} - превишават допустимия брой точки {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2969,5 +2852,5 @@ msgstr "Задаване {0}={1} за {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2984,5 +2867,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Двоен конфликт" @@ -3084,4 +2967,19 @@ msgstr "Разрешаване на конфликтите в изтрито състояние в {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3195,5 +3093,5 @@ msgstr "Прилагане?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3277,15 +3175,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "Грешка в конфигурационния файл на линии {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3296,5 +3194,5 @@ "предпочитания ''{0}'' не е директория." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3303,5 +3201,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3312,5 +3210,5 @@ "на липсваща директория за параметри: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3321,5 +3219,5 @@ "липсваща директория за параметри: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3327,5 +3225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3334,5 +3232,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3341,5 +3239,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3348,5 +3246,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3355,10 +3253,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3366,24 +3264,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Предпочитанията са записани на {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Невъзможно да се качат предпочитанията. Причина: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Невъзможно да се заредят предпочитанията от сървъра." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3392,5 +3290,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3421,5 +3319,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3441,31 +3339,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "Ю" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "С" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "З" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "И" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Списък с промени {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3473,5 +3364,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3482,27 +3373,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3510,5 +3401,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3520,5 +3411,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3526,25 +3417,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "С" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "Текст" #. column header: apply filter for children -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "C" msgstr "Д" #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "I" msgstr "И" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "Р" @@ -3552,43 +3443,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "З" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "Д" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "И" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "С" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "Очакваше се ID >= 0. Имаме: {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "Примитив с ID = 0 не може да бъде невидим." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "Очаква се ID > 0. Имаме {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "Очакваше се Version > 0. Имаме: {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3596,5 +3499,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3622,10 +3525,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3633,7 +3532,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3648,5 +3547,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3664,146 +3563,138 @@ msgstr "параметърът {0} не е в интервала 0..{1}, той е {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Път, обознаващ граница на област, не е затворен." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "мултиполигонен път ''{0}'' не е затворен." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "В релацията има член ''{0}'', който е бил изтрит." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Пътя ''{0}'' е с по-малко от две точки." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Повече от един път \"от\" са намерени." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Повече от един път \"до\" са намерени." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Повече от един \"през\" са открити." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Неизвестна роля ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Неизвестен тип членство за ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Не е намерен път \"от\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Не е намерен път \"до\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Не е открит възел или път \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Пътят \"до\" не започва или свършва във възел \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Пътят \"от\" не започва или свършва във възел \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Пътят \"до\" не започва или свършва в път \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Стил за ограничение {0} не е намерен." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Пресичане между пътища ''{0}'' и ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Вътрешният път ''{0}'' се намира отвън." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Не-Път ''{0}'' в мултиполигон." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Липсва външен път за мултиполигон ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Стилът за външния път ''{0}'' се разминава." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "немаркиран" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "текст" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Грешка: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Предупреждение: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "неактивен" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "избран" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3812,6 +3703,6 @@ msgstr[1] "възли" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3820,7 +3711,8 @@ msgstr[1] "пътища" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3829,21 +3721,37 @@ msgstr[1] "релации" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "немаркиран път" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "незавършен път" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "фон" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "подчертай" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "немаркиран" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "текст" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3987,5 +3895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "железопътна линия" @@ -4001,7 +3909,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4017,4 +3925,10 @@ msgstr[1] "{0} члена" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Списък с промени {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4046,6 +3960,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Конфликт" @@ -4059,7 +3973,7 @@ msgstr "Обектът е изтрит" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4144,74 +4058,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Потребителско име" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Парола" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "използване" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "опции" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Показване на тази помощ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Стандартен параметри на unix геометрия" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Сваляне на област в предала на рамка" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Сваляне на област по препратка (с параметри lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Отваряне на файл (како GPS данни, ако е .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Сваляне на област от рамка, като GPS данни" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Избор с даденото търсене" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Стартиране в максимизиран режим" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Възстановяване на параметрите по подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Избор език." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/път/към/папката/на/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4220,9 +4134,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "примери" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4232,36 +4146,36 @@ "че зареждате данни преди --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Вместо --download= може да укажете osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Активиране обновените разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Зареждане на ранните разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Настройки по подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Зареждане на разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Настройката {0} беше премахната тъй като вече не се използва." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4276,22 +4190,22 @@ msgstr "Редактиране" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Преглед" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Инструменти" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Шаблони" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4299,5 +4213,5 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Аудио" @@ -4376,13 +4290,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "Потребител:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "слоя не е в списъка." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4416,5 +4331,5 @@ msgstr "Инициализиране" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4422,6 +4337,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4430,5 +4345,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4437,5 +4352,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4444,25 +4359,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "позиция" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4470,9 +4385,9 @@ msgstr "Роля" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4504,11 +4419,11 @@ msgstr "роля {0} не участва в двойката за сравнение {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Настройки" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4517,6 +4432,6 @@ msgstr "Маркери" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4524,6 +4439,6 @@ msgstr "Възли" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4531,40 +4446,40 @@ msgstr "Членове" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Няма чакащи tag конфликти за разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags({0} конфликти)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} чакащи tag конфликти за разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Възли(решени)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Възли(с конфликт)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Членове (разрешени)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4572,21 +4487,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Членове (с конфликти)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Няма чакащи конфликти на характеристиките" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Характеристики (с конфликти)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Чакащи за разрешаване конфликти на характеристики" @@ -4618,22 +4533,22 @@ msgstr "точка {0} не е открита в списъка" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "заключване на скролирането" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Сравняване " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Моя версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4641,5 +4556,5 @@ msgstr "Обединена версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4649,30 +4564,30 @@ "приложат решенията за обединяване." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Тяхна версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> горе" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> долу" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4680,5 +4595,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4686,14 +4601,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4701,5 +4616,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4707,23 +4622,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Нагоре" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Преместване нагоре на избраните елементи с една позиция" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Надолу" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Преместване на избраните елементи надолу с една позиция" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4734,28 +4649,28 @@ msgstr "Премахни" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Фиксиране" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Фиксиране" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Фиксиране на текущия списък обединени елементи" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Освобождаване" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "" "Освобождаване на списъка обединени елементи и стартиране на обединяването" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4764,5 +4679,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4771,5 +4686,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4778,5 +4693,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4785,5 +4700,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4792,5 +4707,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4800,5 +4715,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5039,10 +4954,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5052,10 +4967,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5140,9 +5055,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Приложи" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5150,6 +5065,6 @@ msgstr "няма/никой" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "всички" @@ -5238,7 +5153,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5248,6 +5163,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5355,4 +5270,58 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Изтриване на избраните обекти." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Списък с промени {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "" +"Отваряне на нов списък с промени и използването му при следващо качване" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Сваляне" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Сваляне на картографски данни от OSM сървър." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Затваряне на избраните отворени списъци с промени" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Показване на информация" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Редактиране на релацията" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5366,12 +5335,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5389,18 +5358,18 @@ msgstr "Списък промени: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "Отваряне диалог за сливане на избраните обекти от горния списък." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5408,25 +5377,25 @@ msgstr "Изберете на картата всички обекти, избрани в списъка по-горе." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Прекъсни разрешаване на кофликти и затвори диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Прилагане на разрешените конфликти и затваряне на диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Прилагане на резолюцията" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "Затваряне въпреки всичко" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "Продължаване разрешаването на кофликти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5438,26 +5407,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "Конфликтът не е разрешен напълно" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Разрешаване на конфликти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Разрешаване на конфликти за ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5468,41 +5437,41 @@ msgstr "Добави" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "Редактиране на филтъра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "изтриване на филтъра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "Преместване филтъра нагоре" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "Преместване филтъра надолу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "Разрешаване на филтъра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "Скриване на елементи" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "Обръщане на филтъра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "Режим на филтъра" @@ -5541,5 +5510,5 @@ msgstr "Показване историята на избраните елементи." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5554,34 +5523,34 @@ msgstr "Отваряне списъка с всички заредени слоеве." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Изтриване избрания слой." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Показване/скриване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Превключване видимостта на избрания слой." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Активиране" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Активиране на избрания слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Обедини този слой с друг слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Преместване избрания слой един ред нагоре." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Преместване избрания слой един ред надолу." @@ -5591,5 +5560,177 @@ msgstr "Информация за слоя" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Връзки" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Отваряне списъка с всички релации" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Връзки: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Редактиране на релацията" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Изтриване на избраната връзка" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Създаване на нова релация" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Текуща селекция" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Отваряне на списък с избрани обекти." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Мащабирай до избрания(те) елемент(и)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Мащабиране по селекцията" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Избр.: Рел.:{0} / Пътища:{1} / Възли:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Избор" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Избрано: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Отсъедини панела" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Затвори този панел. Можете да го отворите отново с помощта на бутоните на " +"левия панел." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Автори" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Покажи списък хора, работещи по избраните обекти." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} Автор" +msgstr[1] "{0} Автора" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "Липсваща кодировка" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Автор" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "брой обекти" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "непълен" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "затворен път" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Зареждане на отворени пакети с изменения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5598,22 +5739,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "<различни>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Промени стойностите?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5622,5 +5763,5 @@ msgstr[1] "Промяна параметрите на {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5629,228 +5770,71 @@ msgstr[1] "Това ще промени до {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Моля, изберете ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Изберете стойност" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Моля, изберете обектите, чиито параметри искате да промените." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Параметри/Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Параметри на избраните обекти" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Член на" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Добавяне на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Свойства: {0} / Членство: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Параметри / Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Промяна на връзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Изтриване от връзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Изваждане на избраните обекти от релация {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Изтриване на избрания ключ за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Изтриване на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Добавяне на нова двойка ключ/стойност за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Редактиране стойността на избрания ключ за всички обекти" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Връзки" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Отваряне списъка с всички релации" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Връзки: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Редактиране на релацията" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Изтриване на избраната връзка" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Създаване на нова релация" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Текуща селекция" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Отваряне на списък с избрани обекти." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Мащабирай до избрания(те) елемент(и)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Мащабиране по селекцията" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Избр.: Рел.:{0} / Пътища:{1} / Възли:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Избор" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Избрано: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Отсъедини панела" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Затвори този панел. Можете да го отворите отново с помощта на бутоните на " -"левия панел." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Автори" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Покажи списък хора, работещи по избраните обекти." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} Автор" -msgstr[1] "{0} Автора" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Показване на информация" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "Липсваща кодировка" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Автор" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "брой обекти" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5914,19 +5898,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Сваляне всички непълни пътища и възли от връката" -msgstr[1] "Сваляне всички непълни пътища и възли от връката" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Свали членовете на връзките" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Сваляне на връзка {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -5944,14 +5927,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Приложи роля" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Установява роля за избраните членове" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5960,14 +5941,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5977,9 +5958,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5989,15 +5970,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -6005,5 +5986,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -6011,20 +5992,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "Редактор на отношения: Премахване на избраното" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6033,70 +6014,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "Сортиране на членовете на връзката" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Спорт" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "Редактор на връзки: Сортиране" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "Преместване на текущо избраните членове нагоре" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "Редактор на връзки: Преместване нагоре" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "Преместване на текущо избраните членове надолу" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "Редактор на връзки: Преместване надолу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "Премахване на текущо избраните членове от тази връзка" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "Редактор на връзки: Премахване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "Изтриване на текущо редактираната врзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "Да, създай конфликт и затвори" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "Не, продължава редактирането" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6105,9 +6085,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "Конфликт в данните" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6116,49 +6096,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "Прилагане на обновяването и затваряне на прозореца." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Добави празен етикет" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Свали членовете на връзките" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Сваляне членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "Редактор на връзки: Сваляне на членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "Свали членовете на връзките" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "Установява роля за избраните членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Приложи роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6168,34 +6146,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "Да, приложи го!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "Не, не прилагай!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "Потвърди празна роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "Увеличение до" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6307,10 +6285,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6320,5 +6298,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6404,9 +6382,4 @@ msgid "Download Area" msgstr "Област за сваляне" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Сваляне" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6707,6 +6680,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6719,6 +6690,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6989,4 +6958,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7209,5 +7182,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7250,116 +7223,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Име" @@ -7383,15 +7356,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Тип" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7562,10 +7535,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7573,5 +7546,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7579,9 +7552,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7696,6 +7669,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "неизвестно" @@ -7717,13 +7690,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7758,4 +7731,129 @@ msgstr "Версия" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Синхронизиране само на възел {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Синхронизиране само на пътя {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Синхронизиране само на релацията {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Синхронизиране на целия набор данни" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Качването се провали понеже на сървъра има по-нова " +"версия на един
от вашите възли, пътища или релации.
Причина за " +"конфликта се явява {0} с id {1},
версия " +"на сървъра {2}, а ваша версия {3}.

Натиснете {4} за " +"да синхронизирате само конфликтните примитиви.
Натиснете {5} за да синхронизирате целия локален набор данни с сървъра." +"
Натиснете {6} за да прекратите и продължите " +"редактирането.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Забелязани са конфликти" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Качването неуспешно защото сървърът има по-нова " +"версия
на някой от вашите възли, пътища, или отношения.

Кликнете " +"{0} за да синхронизирате цялата база данни със сървъра." +"
Кликнете {1} за отказ и продължаване на редакциите." +"
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Пакета с изменения е затворен" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Опишете измененията на качваните от вас данни:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7774,40 +7872,151 @@ msgstr "Няма отворен сисък с промени." -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Качване на данните към вече отворен списък с промени" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" +"Отваряне на нов списък с промени и използването му при следващо качване" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Обновяване списъка с промени ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Качване на данните към вече отворен списък с промени" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "Затваряне на списъка с промени след качване" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" "Моля, изберете списъка с промени, който искате да се затвори" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Затваряне на списъците с промени" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "Затваряне на избраните отворени списъци с промени" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Затваряне на сисъка с промени." -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Съхрани потребителското име и паролата (нешифрирано)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Моля, въведете потребителско име" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Моля въведете маркери за вашата следа." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Внимание: Паролата ще бъде предадена нешифрирана." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Атлетика" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Промяна на връзка" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7875,17 +8084,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "Качване и запис на променените слоеве..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7898,9 +8107,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7914,9 +8123,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7931,50 +8140,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "Затваряне на прозореца и продължаване на редактирането с JOSM" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Откажи промените и Изход" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "Отхвърляне и изтриване" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "Запис/Качване и край." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "Подготовка на слоя ''{0}'' за качване..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7982,5 +8191,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -8053,40 +8262,381 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Качване" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Настройки" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" +"Отваряне на нов списък с промени и използването му при следващо качване" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "за напреднали" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Настройка на достъпните разширения." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Качване на данни за слой ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Качване на промени" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "Качване на променените примитиви" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "Невалиден коментар на заявката за качване" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "Прекъсване на качването и продължаване с редактирането" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Етикети на списък с промени {0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "Подготовка на примитивите за качване ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Качване на данни за слой ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "Продължаване на качването" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "За програмата" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Продължаване на качването" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Изберете обекти за качване" +msgstr[1] "Изберете обекти за качване" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Пакета с изменения е затворен" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "Изберете обекти за качване" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "Прекратяване на качването" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Моля, изберете ред за изтриване." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" +"Отваряне на нов списък с промени и използването му при следващо качване" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Обекти за добавяне:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Променени обекти:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Обекти за изтриване:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8095,5 +8645,5 @@ msgstr[1] "{0} обекта за добавяне:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8102,5 +8652,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8109,211 +8659,37 @@ msgstr[1] "{0} обекта за изтриване:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Качване на промени" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "Качване на променените примитиви" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "Невалиден коментар на заявката за качване" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Моля, въведете първо желаните координати." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "Прекъсване на качването и продължаване с редактирането" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Опишете измененията на качваните от вас данни:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" -"Отваряне на нов списък с промени и използването му при следващо качване" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Качване на данните към вече отворен списък с промени" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "Затваряне на списъка с промени след качване" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Етикети на списък с промени {0}" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "Подготовка на примитивите за качване ..." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "Изберете обекти за качване" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "Прекратяване на качването" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "Продължаване на качването" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Качване на всички промени в една заявка" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "Лоша заявка" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} метри" -msgstr[1] "{0} метри" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Моля въведете филтър." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "GPS точка" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Настройка рисуването на линии" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Използвай глобалните настройки." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Чертай линии между точките на този слой." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Не чертай линии между точките на този слой." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Избиране варианти за чертане на линиите." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8321,5 +8697,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8328,5 +8704,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8408,5 +8784,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Описание" @@ -8438,10 +8814,10 @@ msgstr[1] "{0} точки на интерес" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Преобразувай в слой данни" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8451,12 +8827,12 @@ "
Ако искате да качвате следи, погледнете тук:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8465,29 +8841,29 @@ msgstr "Преобразувано от: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Свали от OSM по дължина на тази следа" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Свали всичко в пределите на:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} метри" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Максимална област за една заявка:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8498,9 +8874,9 @@ "Продължаване?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Няма GPX следа в слоя за да асоциираме звук с нея." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8510,5 +8886,5 @@ "са пропуснати или преместени в началото." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8518,23 +8894,23 @@ "смислено да се предположи тяхното време, бяха пропуснати." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Слой Данни {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "извън областта за сваляне" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8543,5 +8919,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8555,5 +8931,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8566,11 +8942,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8579,36 +8955,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} се състои от:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "неустановена" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "API версия: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Преобразувай в слой GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8616,5 +8992,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8623,5 +8999,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8629,5 +9005,5 @@ msgstr[1] "точки" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8636,5 +9012,5 @@ msgstr[1] "следа с {0} точки" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8643,5 +9019,5 @@ msgstr[1] "{0} се състои от {1} следи" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8650,24 +9026,24 @@ msgstr[1] "{0} точки" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX Файлове (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Файлът {0} е зареден вече под името \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Грешка при разбор {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Не може да се прочете \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8679,34 +9055,34 @@ "изберете времева зона

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Време на снимката (от EXIF):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Gps време (прочетено от снимката по-горе): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [дд/мм/гггг чч:мм:сс]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Намирам се в часовата зона: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Без дата" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Отваряне друга снимка" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Синхронизиране време от снимка на GPS приемник" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8716,71 +9092,156 @@ "Моля използвайте изисквания формат!" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Невалидна дата" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "<Няма още GPX следи заредени>" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX следа: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Отвори друга GPX следа" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Авто-отгатване" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Обновяване позицията на: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Часова зона: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Отместване:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Мога да фотографирам екрана на моя GPS приемник.
Това може ли да " -"помогне?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Обновяване позицията на: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Всички изображения" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Изображението няма EXIF позиция" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Няма още маркирани изображения" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Нищо не е избрано!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Съотнесени {0} от {1} снимки към GPX следа." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Съпоставяне на изображения с GPX следа" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Корелнутииране" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Авто-отгатване" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Невалидна часова зона" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Невалидно отместване" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Проследяване" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Часови пояс: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Минути: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Секунди: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Времева разлика от {0} дни)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "Съотнасянето на снимки към следа се провали" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Настройване часови пояс и отместване" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "Избраните снимки не съдържат времева информация." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Снимките не съдържат времева информация" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "Избраната GPX следа не съдържа времена. Моля изберете друга." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX следата няма информация за времето" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "Трябва да изберете GPX следа" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "Няма избрана GPX следа" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8791,9 +9252,5 @@ "Очакван формат: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Невалидна часова зона" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8804,134 +9261,56 @@ "Очакван формат: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Невалидно отместване" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Открити {0} съвпадения на {1} в GPX следа {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX Следата е заредена" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Избраните снимки не съдържат времева информация." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Снимките не съдържат времева информация" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "Избраната GPX следа не съдържа времена. Моля изберете друга." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX следата няма информация за времето" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Часови пояс: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Минути: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Секунди: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Съотнесени {0} от {1} снимки към GPX следа." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Времева разлика от {0} дни)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Разминаване между следата и снимките: {0}мин {1}сек" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Съотнасянето на снимки към следа се провали" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Настройване часови пояс и отместване" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Стойности по подразбиране" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Извличане на GPS координати от EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Започване на преглед на директории" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Прочитане на снимки..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Четене {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Невъзможно да се вземе каноничното име на директория {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Сканиране на директория {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Намерен е празен файл в директория {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Грешка при четене на файлове от директория {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Изображения с данни за местоположение" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Корелиране към GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8939,52 +9318,100 @@ msgstr[1] "изображения" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} открити с gps тагове." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Винаги да се премества и този прозорец да не се показва повече" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Файлът не може да бъде намерен." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Без изображение" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Зареждане {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Грешка във файла {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Показване на геомаркирани фотографии" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Предишен" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Предишно изображение" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Страница: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Премахване на снимка от слой" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Изтриване от връзка" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Следващ" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Следващо изображение" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Центриране на изгледа" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Показване на най-доброто оразмеряване и 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8995,5 +9422,5 @@ "Височина: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9099,4 +9526,12 @@ msgid "Error displaying URL" msgstr "Грешка показване URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9326,7 +9761,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Всички" @@ -9396,6 +9830,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Вело" @@ -9798,31 +10232,92 @@ "Проекцията {0} не може да бъде активирана. Използва се меркаторска проекция." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Използване на прокси-сървър" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Анонимно" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Хостел / студентско общежитие" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Порт:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Парола" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Настройки на прокси" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Адрес" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Порт" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Потребителско име" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Парола" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "Основен URL адрес на OSM сървъра (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Парола за OSM акаунт. Оставете празно за да не запомня програмата вашата " +"парола." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Основен URL адрес на сървъра" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM парола" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10130,5 +10625,5 @@ msgstr "<няколко>" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10138,13 +10633,13 @@ msgstr[1] "Премахване на стари ключове от {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "Добавяне на нов етикет" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10152,18 +10647,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Незадължителни Атрибути:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "затворен път" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестен тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10174,16 +10669,16 @@ msgstr "Не може да се прочете източник на шаблони за маркиране: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Грешка при разбор {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Елементи от тип {0} се поддържат." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10192,18 +10687,18 @@ msgstr[1] "Промяна {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Нищо не е избрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Селекцията е неподходяща!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Прилагане шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Промяна параметри" @@ -10232,4 +10727,11 @@ msgstr "Зареждане точки {0} до {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10245,12 +10747,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "Грешка! Възможно е да липсват маркери (тагове)." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Подготвяне на данните..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "неочакван номер на колона {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10353,16 +10910,16 @@ msgstr "Грешка при разбор: невалидна структура на gpx документа" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "Непознат режим {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10372,40 +10929,40 @@ msgstr "Сваляне данни от OSM..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10413,10 +10970,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Зареждане точки {0} до {1}..." -msgstr[1] "Зареждане точки {0} до {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10453,34 +11010,32 @@ msgstr "Грешка при NMEA импортиране!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "Тази версия на JOSM е несъвместима с конфигурирания сървър." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"Поддържа версии на протокола 0.5 и 0.6, докато сървъра казва че поддържа от " -"{0} до {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "При комуникация с {0} се свързахме използвайки протокол версия {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10488,66 +11043,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "Създаване на списък с промени ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Успешно отворен списък с промени {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Обновяване списъка с промени ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Затваряне на списък промени по версии..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Няма съществуващ набор промени за качване на разлики" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Подготвяне…" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Качване..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Подготвяне на базата данни ..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Промяна {0} обект" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "Изчакване 10 секунди " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "ОК - нов опит" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10574,4 +11140,14 @@ msgid "Invalid bz2 file." msgstr "Невалиден bz2 файл." + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10582,5 +11158,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10607,5 +11183,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10613,5 +11189,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10624,5 +11200,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10633,59 +11209,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Грешна парола или потребителско име." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Внимание: Паролата ще бъде предадена нешифрирана." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Съхрани потребителското име и паролата (нешифрирано)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Въведете парола" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Вход" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "Основен URL адрес на OSM сървъра (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Парола за OSM акаунт. Оставете празно за да не запомня програмата вашата " -"парола." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Основен URL адрес на сървъра" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM парола" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10775,5 +11298,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10782,19 +11312,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" @@ -10802,20 +11332,20 @@ "." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10823,19 +11353,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Непълна спецификация с ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Недопустим обект с id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10845,8 +11375,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10856,25 +11386,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10882,5 +11428,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10889,5 +11435,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10895,5 +11441,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10902,13 +11448,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Подготовка на OSM данните..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "Подготвяне на базата данни ..." @@ -10931,21 +11477,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Зареждане на отворени пакети с изменения" +msgstr[1] "Зареждане на отворени пакети с изменения" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Зареждане на отворени пакети с изменения" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10964,7 +11522,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10973,9 +11531,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11027,7 +11581,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 @@ -11035,5 +11589,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -11043,4 +11597,9 @@ msgid "Uploading data ..." msgstr "Качване на данни..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Изтрити или преместени примитиви" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11082,12 +11641,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Изтриване {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Грешка при изтриването на файл на разширение: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11231,9 +11790,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "няма описание" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Още подробности" @@ -11365,4 +11924,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11659,6 +12233,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Качване на следи" @@ -11744,5 +12318,5 @@ msgstr "Качване на GPX следа" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Качване на следи на openstreetmap.org" @@ -11753,5 +12327,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Интерполация на адреси" @@ -11766,11 +12340,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Нечетни" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Четни" @@ -11781,24 +12352,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Номер" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "природа" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "място" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Под наем" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11816,7 +12383,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "вътрешен сегмент" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11929,5 +12495,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11989,21 +12555,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Избор на комуна" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Избери от..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Кадастър" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Авто-определяне източници" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12012,13 +12578,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12043,17 +12609,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Включване автоматично кеширане." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Макс. размер на кеша (в MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12071,9 +12637,9 @@ "данни създадени с това разширение." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "Френски кадастров WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -12081,10 +12647,10 @@ "източници е включено" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Източник" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12093,5 +12659,5 @@ "Замени оригиналния бял фон с фоновия цвят определен в настройките на JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12101,54 +12667,51 @@ "текстове на тъмни фонове." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Позволяване на подреждане в няколко слоя" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Задаване прозрачност на WMS слоевете. Надясно - плътно, наляво - прозрачно." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Рисувай правоъгълник около зареденните от WMS сървър данни." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Взимане по-малки изображения (по-високо качество, но повече памет)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Фиксирана площ (по подразбиране 100m2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Фиксирана размер (от 25 до 1000 метра)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Най-старите файлове автоматично се изтриват когато този размер се премине" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Източник на автомат.-маркери добавен:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Добавяне на \"source=...\" към ?" @@ -12352,5 +12915,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Местоположение" @@ -12549,5 +13112,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Никакви данни не са заредени." @@ -12569,9 +13132,9 @@ msgstr "Преобразуване към GPX слой с анонимно време" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "редактиране gpx следи" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "Редактиране GPX" @@ -12960,7 +13523,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "вода" @@ -13122,19 +13685,19 @@ msgstr "Невъзможно да се получи изображение" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Свързване" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Свързан" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Не сте свързан" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Неуспешна връзка" @@ -13173,33 +13736,33 @@ msgstr "LiveGPS слой" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Записване на GPS следа" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" "Свързване с gpsd сървъра и показване на текущата позиция на слоя LiveGPS." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Центриране веднъж" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Центриране на LiveGPS слоя към текущата позиция." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Авто-Център" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Постоянно центриране на LiveGPS слоя към текущата позиция." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13251,9 +13814,9 @@ msgstr "Действието е неизпълнимо извън пределите на света." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "Режим измерване" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Измервания" @@ -13291,5 +13854,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13300,13 +13863,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13457,5 +14020,5 @@ msgstr "изпълним файл на Firefox" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13554,5 +14117,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13628,41 +14191,41 @@ msgstr "Въведете стойности за тегло" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Интерактивна карта" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Зареждане на квадрант" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Зареждане на всички квадранти" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Увеличаване на мащаба" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Намаляне на мащаба" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "Изчистване на кеша" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "изображение " @@ -13836,4 +14399,43 @@ "предпочитания." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Четни" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Най-малък номер" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Най-голям номер" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Пътна Мрежа" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Най-голям номер" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13852,42 +14454,20 @@ msgstr "Обръщане разделянето на сграда" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Разделяне на сграда" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Създава няколко отделни сгради от една голяма такава." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Изберете един затворен път от поне четири възела." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Разделяне на сграда" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Най-голям номер" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Най-малък номер" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Интерполация" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Име на улица" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Незадължително" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13902,5 +14482,5 @@ msgstr "Няма грешки при проверката" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Мрежа" @@ -14567,38 +15147,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "сграда" @@ -14612,5 +15162,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "област" @@ -14727,10 +15277,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Walking Papers: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15472,6 +16022,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Означение" @@ -15917,5 +16467,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Ширина (метри)" @@ -16033,5 +16583,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "метал" @@ -16043,5 +16593,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "гора" @@ -16299,4 +16849,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16328,8 +16881,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "да" @@ -16477,9 +17032,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "не" @@ -16724,5 +17280,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "улица" @@ -16757,5 +17313,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "служебна" @@ -16789,6 +17345,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "ремонт" @@ -16838,5 +17394,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "кръгово" @@ -17024,6 +17580,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Туристическа пътека" @@ -17144,5 +17700,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17168,4 +17723,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17175,15 +17731,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Оператор" @@ -17395,7 +17951,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Надморска височина" @@ -17814,5 +18370,5 @@ msgstr "тресавище" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17822,5 +18378,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "блато" @@ -18346,32 +18902,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Работно време" @@ -18430,91 +18986,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "денонощно" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "понеделник-петък 08:30-20:00" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00" @@ -18529,5 +19085,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18546,7 +19102,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Ref номер" @@ -18562,5 +19118,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "подземен" @@ -18573,6 +19129,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Такса" @@ -18611,22 +19167,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Магазин" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Редактирай автосалон" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Сервиз" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Редактирай автосервиз" @@ -18634,5 +19178,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Под наем" @@ -18641,10 +19185,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Редактиране коли под наем" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Споделяне на автомобили" @@ -18652,5 +19196,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Редактирай споделяне автомобили" @@ -18658,10 +19202,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Велосипедна стоянка (паркинг)" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Капацитет" @@ -18670,22 +19214,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Редактиране велосипеди под наем" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Редактирай вело-магазин" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Обществен транспорт" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18695,5 +19232,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18701,5 +19238,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Референция" @@ -18707,5 +19244,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Малка ЖП гара" @@ -18713,5 +19250,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Редактирай малка ЖП гара" @@ -18719,5 +19256,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Трамвайна спирка" @@ -18726,5 +19263,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Редактирай трамвайна спирка" @@ -18732,5 +19269,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "ЖП платформа" @@ -18739,5 +19276,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Редактирай ЖП платформа" @@ -18749,5 +19286,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Референция (коловоз #)" @@ -18755,10 +19292,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Област" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Вход в метро" @@ -18767,10 +19304,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Редактирай вход в метро" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Инвалидна количка" @@ -18779,5 +19316,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Автогара" @@ -18786,5 +19323,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Редактирай автогара" @@ -18792,5 +19329,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Автобусна спирка" @@ -18800,5 +19337,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Редактирай автобусна спирка" @@ -18807,17 +19344,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Навес" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Скамейка" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Автобусна платформа" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Редактирай автобусна платформа" @@ -18825,5 +19370,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Такси" @@ -18831,5 +19376,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Редактирай стоянка таксита" @@ -18837,5 +19382,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Летище" @@ -18843,15 +19388,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Редактиране летище" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18859,10 +19404,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Пътуване" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Настаняване" @@ -18874,5 +19419,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Хотел" @@ -18881,15 +19426,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Редактирай хотел" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Звезди" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Мотел" @@ -18897,20 +19442,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Редактирай мотел" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Къща за гости" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Редактирай къща за гости" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Бунгало" @@ -18918,10 +19463,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Редактирай бунгало" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Хостел / студентско общежитие" @@ -18929,30 +19474,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Редактирай хостел / студентско общежитие" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Планинска хижа" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Редактирай планинска хижа" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Площадка за каравани" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Редактирай площадка за каравани" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Къмпинг" @@ -18960,10 +19505,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Редактирай къмпинг" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Храна и напитки" @@ -18974,5 +19519,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Ресторант" @@ -18980,5 +19525,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Редактирай ресторант" @@ -18986,5 +19531,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Кухня" @@ -18992,61 +19537,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "италианска" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "китайска" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "пица" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "бургери" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "гръцка" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "немска" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "индийска" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "местна" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "кебаб" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "турска" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "азиатска" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "тайландска" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "мексиканска" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "японска" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Заведение за бързо хранене" @@ -19054,9 +19599,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Редактирай заведение бързо хранене" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Кафене" @@ -19064,9 +19609,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Редактирай кафене" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Бар" @@ -19074,18 +19619,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Редактирай бар" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Бирария" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Редактирай бирария" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Бар" @@ -19093,9 +19638,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Редактиране на бар" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Нощен клуб" @@ -19103,24 +19648,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Редактирай нощен клуб" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Туризъм" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Атракция" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Редактирай забележилтеност" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Музей" @@ -19128,9 +19673,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Редактирай музей" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Зоопарк" @@ -19139,9 +19684,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Редактирай зоопарк" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Място с добра гледка" @@ -19149,24 +19694,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Редактирай място с добра гледка" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Наблюдателница" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Развлекателен парк" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Редактирай развлекателен парк" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Творба на изкуството" @@ -19174,5 +19719,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Редактирай творба на изкуството" @@ -19180,19 +19725,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Информационен пункт" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Карта" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -19230,5 +19775,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19236,28 +19781,28 @@ msgstr "улица" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "схема" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "място" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "град" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "район" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "По-подробно описание" @@ -19267,5 +19812,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "Показани са пътища за:" @@ -19273,6 +19818,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Велосипедизъм" @@ -19280,5 +19825,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "Планинско колоездене" @@ -19286,6 +19831,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Ски" @@ -19293,5 +19838,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "Колоездене" @@ -19299,46 +19844,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "... възможни са други способи за придвижване" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Информационно табло" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "Съдържание на таблото" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "табела" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "история" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "природа" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "дива природа" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "растения" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "Упътване" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "Информационен пункт" @@ -19346,29 +19891,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "По-точно описание" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1769 msgid "Audioguide" msgstr "Аудио напътствия" #. -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" msgstr "Аудио-напътствия по мобилен телефон?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 +#: build/trans_presets.java:1780 msgid "Phone number" msgstr "Тел. номер" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Други информационни точки" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Редактирай навес" @@ -19376,25 +19921,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Огнище" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Място за пикник" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Редактирай място за излет" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Исторически места" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Замък" @@ -19403,19 +19948,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Редактирай замък" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Руини" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Редактирай руини" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Архиологични разкопки" @@ -19424,9 +19969,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Редактирай архиологични разкопки" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Поле на битка" @@ -19434,10 +19979,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Редактирай поле на битка" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19445,5 +19990,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19451,15 +19996,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Забележителност" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Редактирай забележителност" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Паметник" @@ -19467,55 +20012,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Редактирай паметник" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Крайпътен кръст" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Редактирай крайпътен кръст" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Крайпътен параклис" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Редактирай крайпътен параклис" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "Пограничен камък" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "редактиране на: Пограничен камък" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Места за отдих и развлечения" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Аквапарк" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Редактирай аквапарк" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Площадка" @@ -19523,35 +20068,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Редактирай площадка" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Риболов" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Редактирай риболов" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Спорт" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Спортни съоражения" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Стадион" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Редактирай стадион" @@ -19565,6 +20110,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "вид спорт:" @@ -19956,30 +20501,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "спорт" @@ -19989,225 +20534,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "многобой" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "стрелба с лък" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "атлетика" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "австралийски футбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "бейзбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "баскетбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "игра с мет.топчета" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "игра с асим.топки" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "кану" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "алпинизъм" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "крикет" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "крикет мрежи" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "крокет" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "велоспорт" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "кучешки надбягвания" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "конна езда" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "футбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "голф" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "гимнастика" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "хокей" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "конни надбягвания" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "моторен спорт" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "бейзбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "ракет бол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "ръгби" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "стрелба" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "скейтборд" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "фигурно пързаляне" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "ски" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "футбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "плуване" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "тенис на маса" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "тенис" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Спортен център" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Редактирай спортен център" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Игрище" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Редактирай игрище" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Състезателна писта" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Редактирай състезателна писта" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Поле за голф" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Редактирай поле за голф" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Миниголф" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Редактирай миниголф" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Спорт" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Многобой" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Редактирай многобой" @@ -20246,21 +20791,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "тип" @@ -20299,203 +20844,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "игрище" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "спортен център" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "стадион" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "следа" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "Боулинг зала" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Редактирай боулинг зала" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Атлетика" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Редактирай атлетика" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Стрелба с лък" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Редактирай стрелба с лък" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Скално катерене" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Редактирай скално катерене" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Кану" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Редактирай кану" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Редактирай велосипедизъм" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Надпреварване с кучета" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Редактирай надбягвания с кучета" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Конна езда" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Редактирай конна езда" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Конни надбягвания" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Редактирай конни надбягвания" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Гимнастика" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Редактирай гимнастика" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Моторни спортове" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Редактирай моторни спортове" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Фигурно пързаляне" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Редактирай фигурно пързаляне" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Скейтборд" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Редактирай скейтборд" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Плуване" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Редактирай плуване" @@ -20503,56 +21048,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Редактирай ски" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Тип писта" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "спускане" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "нордическа" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "Зимен парк" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Трудност" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "начинаещ" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "лесно" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "за средно ниво" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "за напреднали" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "експерт" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "свободна езда" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Стрелба" @@ -20560,182 +21105,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Редактирай стрелба" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Спорт (с топка)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Футбол" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Редактирай футбол" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Американски футбол" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Редактирай американски футбол" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Австралийски футбол" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Редактирай австралийски футбол" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Бейсбол" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Редактирай бейсбол" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Баскетбол" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Редактирай баскетбол" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Голф" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Редактирай голф" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "поле за голф" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Буле (игра с мет.топчета)" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Редактирай Игра с мет.топчета" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Игра с асим.мет.топки (bowls)" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Редактирай игра с асим.мет.топки" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Крикет" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Редактирай крикет" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Крикет мрежи" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Рекдатирай крикет мрежи" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Крокет" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Редактирай крокет" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Хокей" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Редактирай хокей" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Пелота" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Редактирай пелота" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "ракет" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Редактирай ракет" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Ръгби" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Редактирай ръгби" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Тенис на маса" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Редактирай тенис на маса" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Тенис" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Редактирай тенис" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "Изкуствени" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Сгради" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Сграда" @@ -20743,5 +21288,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Обществена сграда" @@ -20749,10 +21294,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Редактирай обществена сграда" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Кметство" @@ -20760,10 +21305,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Редактирай кметство" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Посолство" @@ -20771,10 +21316,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Редактирай посолство" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Съдебна сграда" @@ -20783,10 +21328,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Редактирай съдебна сграда" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Затвор" @@ -20795,10 +21340,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Редактирай затвор" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Полиция/Милиция" @@ -20808,10 +21353,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Редактирай полиция/милиция" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Пожарна" @@ -20820,10 +21365,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Редактирай пожарна" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Пощенска станция" @@ -20831,5 +21376,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Редактирай пощенска станция" @@ -20837,15 +21382,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Детска градина" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Редактирай детска градина" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Училище" @@ -20853,10 +21398,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Редактирай училището" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Университет" @@ -20864,10 +21409,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Редактирай университет" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Колеж" @@ -20875,5 +21420,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Редактирай колеж" @@ -20881,5 +21426,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Кино" @@ -20888,10 +21433,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Редактирай кино" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Библиотека" @@ -20900,9 +21445,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Редактирай библиотека" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Център на изкуствата" @@ -20910,10 +21455,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Редактирай център на изкуствата" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Театър" @@ -20922,10 +21467,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Редактирай театър" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Място за богослужение" @@ -20935,5 +21480,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Редактирай място за богослужение" @@ -20942,6 +21487,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Религия" @@ -20950,66 +21495,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "Бахаи" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "Будизъм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "Християнство" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "Индуизъм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "Джайнизъм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "Юдаизъм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "Мусулманство" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "Сикхизъм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "Спиритуализъм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "Даосизъм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "Унитаристи" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "Зороастризъм" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Конфесия" @@ -21018,81 +21563,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "Англиканска" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "Баптизъм" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "Католическо" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "Евангелска" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "Свидетели на Йехова" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "Лютеранство" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "Методизъм" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "Мормони" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "Православие" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "Петдесетници" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "Пресвитериани" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "Протестантизъм" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "Кваркери" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "Шийти" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "Сунити" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Адреси" @@ -21101,5 +21646,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Редактиране на информацията за адреса" @@ -21107,5 +21652,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Номер" @@ -21113,20 +21658,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Име на дом" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Име на улица" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Име на град" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Пощенски код" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Код на държава" @@ -21135,5 +21685,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Редактирай интерполация на адреси" @@ -21141,61 +21691,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Схема на номериране" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "нечетни" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "четни" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "по азбучен ред" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Изкуствени" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Цех" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Редактирай цех" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Кула" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Редактирай кула" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "Тип на кулата" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "Височина (в метри)" @@ -21203,25 +21753,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Водонапорна кула" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Редактирай водонапорна кула" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Газохранилище" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Редактирай газохранилище" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Маяк / Светлинен фар" @@ -21229,10 +21779,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Редактирай маяк / светлинен фар" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Мелница" @@ -21240,10 +21790,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Редактирай мелница" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Тръбопровод" @@ -21252,37 +21802,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Редактирай газопровод" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "нефт" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "газ" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "отходна тръба" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "подводно" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Пречиствателна станция" @@ -21292,10 +21842,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Редактирай пречиствателна станция" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Кран" @@ -21303,10 +21853,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Редактирай кран" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Маяк / Радиопредавател" @@ -21314,10 +21864,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Редактирай маяк / радиопредавател" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Точка на наблюдение" @@ -21325,10 +21875,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Редактирай точка на наблюдение" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Видеонаблюдение" @@ -21336,5 +21886,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Редактирай видеонаблюдение" @@ -21342,5 +21892,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Електроцентрала" @@ -21350,35 +21900,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Редактирай електрогенератор" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "вятърна енергия" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "водна енергия" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "енергия от изкопаеми горива" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "атомна" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "въглища" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "слънчева енергия" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Електростанция" @@ -21387,10 +21937,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Редактирай електростанция" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Електроподстанция" @@ -21399,5 +21949,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Редактирай електроподстанция" @@ -21405,10 +21955,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Номер линия" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Електрически стълб от ЕПМ" @@ -21419,23 +21969,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Редактирай стълб от ЕПМ" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "кула" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Линия за електропренос" @@ -21444,75 +21994,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Редактирай линия за електропренос" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "Тип на линия" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "линия" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "второстепенна линия" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Волтаж" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "Брой проводници" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "Брой на жилата на всеки кабел" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "един" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "два" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "три" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "четири" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Обществени удобства" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Тоалетни" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Забележка" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Пощенска кутия" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Телефон" @@ -21521,5 +22071,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Редактирай телефон" @@ -21527,5 +22077,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Монети" @@ -21533,5 +22083,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Банкноти" @@ -21539,5 +22089,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Електрони средства за разплата" @@ -21545,5 +22095,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Дебитни карти" @@ -21551,15 +22101,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Кредитни карти" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Телефонни карти" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Рециклиране" @@ -21568,5 +22118,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Редактиране на станция за рециклиране" @@ -21574,68 +22124,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Батерии" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Консервни кутии" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Дрехи" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Стъкло" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Хартия" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Вторични суровини" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Скамейка" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "Материал" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "камък" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "пластмаса" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "Цвят" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "черно" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "кафяво" @@ -21706,39 +22251,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "зеленина" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "червено" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "синьо" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "сиво" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "бяло" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "Брой седящи места" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Ловно скривалище" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Редактирай ловно скривалище" @@ -21747,30 +22292,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Височина" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "нисък" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "среден" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "пълен" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Скривалище" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Заключване" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Фонтан" @@ -21779,10 +22324,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Редактирай фонтан" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Питейна вода" @@ -21791,10 +22336,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Редактирай питейна вода" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Дестка ясла" @@ -21802,33 +22347,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Редактирай детска ясла" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Магазини" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Редактирай автосалон" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Трасиране на езера" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Редактирай вело-магазин" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Супермаркет" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Редактирай супермаркет" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "Аптека" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "Редактиране на: аптека" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Бакалия" @@ -21836,9 +22405,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Редактирай бакалия" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Будка" @@ -21846,27 +22415,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Редактирай будка" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "Книжарница" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "Редактиране на книжарница" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Туристическа агенция" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Редактиране на туристическа агенция" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Автомат за стоки" @@ -21874,5 +22443,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Редактирай автомат за стоки" @@ -21880,88 +22449,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Продукти за автоматична продажба" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "билети за обществен транспорт" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "карта на обществен транспорт" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "билети за паркиране" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "храна" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "напитки" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "сладки" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "цигари" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "фотографии" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "храна за животни" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "вестници" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "играчки" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "пощенски марки" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-карти" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "телефонни ваучери" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "ваучери" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "презервативи" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "тампони" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "торби за екскременти" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "клиентски карти" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Месарница" @@ -21969,9 +22538,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Редактирай месарница" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Фурна" @@ -21979,9 +22548,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Редактирай фурна" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Цветарски магазин" @@ -21989,18 +22558,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Редактирай цветарски магазин" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Био магазин" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Редактирай био магазин" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Алкохол" @@ -22008,54 +22577,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Редактиране магазин за алкохол" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Напитки" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Редактиране магазин за безалкохолни" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Компютри" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Редактирай компютърен магазин" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Електроника" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Редактирай магазин за електроника" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Аудио HiFi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Редактирай магазин за Аудио HiFi" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Мебелен магазин" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Редактирай мебелен магазин" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Градински център" @@ -22063,9 +22632,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Редактирай градински център" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Железария" @@ -22073,9 +22642,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Редактирай железария" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Магазин \"Направи си сам\"" @@ -22083,54 +22652,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Редактирай магазин \"Направи си сам\"" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Книжарница" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Редактирай книжарница" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Фризьорски салон / козметика" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Редактирай фризьорски салон / козметика" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Обувки" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Редактирай магазин за обувки" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Играчки" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Редактирай магазин за играчки" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Видео" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Редактирай Видео-магазин" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Химическо чистене" @@ -22138,9 +22707,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Редактирай химическо чистене" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Пералня" @@ -22148,9 +22717,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Редактирай пералня" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Туристически стоки (за активен отдих)" @@ -22158,28 +22727,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Редактирай мазизин за туристически стоки" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Редактирай магазин за спортни стоки" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Оптика" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Редактирай оптика" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Пари" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Банка" @@ -22187,14 +22756,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Редактирай банка" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Банкомат" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Обмяна на валута" @@ -22202,5 +22771,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Редактирай обмяна на валута" @@ -22208,15 +22777,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Редактирай банкомат" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Здраве" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Доктори" @@ -22224,18 +22793,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Редактирай доктори" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Стоматолог" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Редактирай стоматолигия" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Аптека" @@ -22243,5 +22812,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Редактирай аптека" @@ -22249,9 +22818,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Приготвят лекарства по рецепти" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Болница" @@ -22259,10 +22828,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Редактирай болница" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Пункт за връзка със спешна помощ" @@ -22271,5 +22840,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Редактирай пункт за връзка със спешна помощ" @@ -22278,20 +22847,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Номер на пункта" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Име на пункта" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Телефонен номер" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Използвайте международен код, като например +12-345-67890)" @@ -22299,5 +22868,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Ветеринар" @@ -22306,64 +22875,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Редактирай ветеринар" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "География" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Места" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Континент" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Редактирай континент" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Държава" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Редактирай държава" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Област/Щат" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Редактирай област/щат" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Област" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Редактирай област" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Графство" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Редактирай графство" @@ -22371,15 +22940,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Град (над 100 000)" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Редактирай голям град" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Град (под 100 000)" @@ -22387,10 +22956,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Редактирай град" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Квартал/предградие" @@ -22398,25 +22967,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Редактирай квартал" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Село" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Редактирай село" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Махала" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Редактирай махала" @@ -22424,5 +22993,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Местност" @@ -22430,10 +22999,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Редактирай местност" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Остров" @@ -22441,10 +23010,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Редактирай остров" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "Скала" @@ -22452,5 +23021,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "Редактиране на: скала" @@ -22458,5 +23027,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Пещерен вход" @@ -22464,10 +23033,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Редактиране пещерен вход" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Връх" @@ -22475,10 +23044,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Редактиране връх" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Ледник" @@ -22486,10 +23055,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Редактиране ледник" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Вулкан" @@ -22497,70 +23066,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Редактиране вулкан" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Граници" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Национална" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Редактирай национална граница" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Административна" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Редактирай административна граница" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Гражданска" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Редактирай гражданска граница" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Политическа" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Редактирай политическа граница" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Национален парк" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Редактирай граница национален парк" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Земеползване" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Дърво" @@ -22569,15 +23138,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Редактирай дърво" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Ботаническо название" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Гора" @@ -22586,5 +23155,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Редактирай гората" @@ -22592,17 +23161,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "иглолистен" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "широколистен" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "смесен" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Гора" @@ -22611,14 +23180,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Редактирай гора" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Природен резерват" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Редактирай природен резерват" @@ -22626,25 +23195,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Сипей" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Редактирай сипей" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Шубрак" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Редактирай шубрака" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Скалист склон" @@ -22652,10 +23221,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Редактирай скалист склон" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Пустош" @@ -22663,5 +23232,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Редактиране пустош" @@ -22669,5 +23238,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Двор ферма" @@ -22676,45 +23245,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Редактирай двор ферма" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Обработваема земя" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Редактирай обработваема земя" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Поляна" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Редактиране поляна" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Лозе" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Редактирай лозе" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Земя за лично ползване" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Редактиране на: Земя за лично ползване" @@ -22722,25 +23291,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Градина" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Редактирай градина" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Трева" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Редактирай трева" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Зелено село" @@ -22748,10 +23317,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Редактирай зелено селище" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Общи" @@ -22759,20 +23328,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Редактирай общи" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Парк" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Редактирай парк" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Спортна площадка" @@ -22780,5 +23349,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Редактирай спортна площадка" @@ -22786,15 +23355,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Жилищна зона" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Редактирай жилищна зона" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Църковно гробище" @@ -22802,9 +23371,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Редактирай църковно гробище" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Гробище" @@ -22812,39 +23381,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Редактирай гробище" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Търговия на дребно" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Редактирай търговия на дребно" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Търговия" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Редактирай търговия" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Промишленост" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Редактирай промишленост" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Железопътен път" @@ -22852,15 +23421,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Редактирай ЖП" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Военен" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Редакирай военна земя" @@ -22868,55 +23437,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Строителна площадка" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Редактирай строителна площадка" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Индустриални развалини" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Редактирай ундустриални развалини" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Зелени площи" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Редактирай зелени площи" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Сметище" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Редактирай сметище" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Кариера" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Редактирай кариера" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Мултиполигон" @@ -22926,5 +23495,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Редактиране мултиполигон" @@ -22933,10 +23502,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "външен сегмент" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "вътрешен сегмент" @@ -22944,5 +23513,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Ограничения при завиване" @@ -22951,5 +23520,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Редактиране на ограничения при завиване" @@ -22957,34 +23526,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Ограничения" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "забранен ляв завой" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "забранен десен завой" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "забранено напред" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "забранен обратен завой" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "само десен завой" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "само ляв завой" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "само направо" @@ -22993,15 +23562,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "от път" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "през точка или път" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "до път" @@ -23009,5 +23578,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Маршрут" @@ -23016,5 +23585,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Редактиране маршрут" @@ -23022,5 +23591,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Тип маршрут" @@ -23092,24 +23661,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "велосипед" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "автобус" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "път" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "ферибот" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "ски" @@ -23162,5 +23731,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23169,13 +23738,13 @@ msgstr "пеш" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "туристически маршрут" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "трамваен маршрут" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "обиколка" @@ -23189,10 +23758,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "метро" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Описание на символ" @@ -23200,31 +23769,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Мрежа" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "Състояние на пътя" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "предложен" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "алтернативен" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "временен" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "връзка" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Цвят (hex)" @@ -23233,30 +23802,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "сегмент от маршрут" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "сегмент напред" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "сегмент назад" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "точка за спиране" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "точка за спиране напред" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "точка за спиране назад" @@ -23467,130 +24036,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23607,98 +24050,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "остарял, вече невалиден" @@ -24075,7 +24427,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "път_от_пътна_мрежа" @@ -24139,13 +24491,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "ЖП" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24161,5 +24592,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "услуги" @@ -24173,5 +24604,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "форд" @@ -24192,5 +24623,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "обръщало" @@ -24205,5 +24636,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "точка за връзка със спешна помощ" @@ -24218,5 +24649,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "речен бряг" @@ -24230,5 +24661,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "поток" @@ -24242,5 +24673,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "док" @@ -24262,16 +24693,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "акведукт" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24368,4 +24787,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24434,13 +24860,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "изкуствени съоръжения" @@ -24486,6 +24912,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24502,7 +24928,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "ЖП точка" @@ -24525,10 +24951,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "друга ЖП линия" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "ЖП railover" @@ -24564,11 +24990,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "стара ЖП линия" #. color rail +#. #. 1 #. 50000 @@ -24609,6 +25036,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "въздушен транспорт" @@ -24622,5 +25049,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "терминал" @@ -24642,5 +25069,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "Надземен_транспорт_тъмен" @@ -24654,5 +25081,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "Надземен_транспорт_светъл" @@ -24660,4 +25087,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24707,7 +25141,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "надземен транспорт" @@ -24724,5 +25158,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "лесна ски писта" @@ -24737,5 +25171,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "средно трудна ски писта" @@ -24750,5 +25184,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "ски писта за напреднали" @@ -24763,5 +25197,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "ски писта за експерти" @@ -24776,5 +25210,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "ски писта freeride" @@ -24789,5 +25223,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "ски писта за начинаещи" @@ -24907,11 +25341,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "захранване" @@ -24925,5 +25359,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "кей" @@ -24937,5 +25371,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "тръбопровод" @@ -25063,12 +25497,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "отдих и развлечение" @@ -25082,5 +25533,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "яхт пристан" @@ -25118,4 +25569,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25134,4 +25601,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25152,8 +25627,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "Обществени услуги" @@ -25255,10 +25732,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "Обществен трафик" @@ -25512,5 +25989,5 @@ #. #. -#. +#. #. color health #. @@ -25656,4 +26133,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25673,23 +26158,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "Обществено осветление" @@ -25721,6 +26206,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "светла_вода" @@ -25781,14 +26266,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "здравеопазване" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26135,5 +26620,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26156,5 +26640,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "магазин" @@ -26226,8 +26711,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "хотел" @@ -26328,9 +26813,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "туризъм" @@ -26418,9 +26903,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "исторически" @@ -26434,5 +26919,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "кариера" @@ -26446,5 +26931,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "сметище" @@ -26466,5 +26951,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "басейн" @@ -26478,5 +26963,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "гора" @@ -26490,5 +26975,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "двор ферма" @@ -26511,5 +26996,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "търговия на дребно" @@ -26523,5 +27008,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "индустрия" @@ -26535,5 +27020,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "индустриални развалини" @@ -26547,5 +27032,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "зелена площ" @@ -26559,5 +27044,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "ЖП" @@ -26614,7 +27099,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "военни" @@ -26628,5 +27113,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "гробище" @@ -26639,5 +27124,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "връх" @@ -26652,5 +27137,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "ледник" @@ -26664,5 +27149,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "вулкан" @@ -26717,8 +27202,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "природа" @@ -26732,5 +27217,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "храсталак" @@ -26744,5 +27229,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "пустош" @@ -26756,5 +27241,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "гориста местност" @@ -26768,5 +27253,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "кал" @@ -26780,5 +27265,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "плаж" @@ -26856,8 +27341,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "маршрут" @@ -26905,7 +27390,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "граница" @@ -27055,11 +27540,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "място" @@ -27107,6 +27592,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "адрес" @@ -27462,98 +27947,97 @@ msgstr "" +#~ msgid "Updating primitive" +#~ msgstr "Обновяване на примитива." + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Липсва затваряща скоба." + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е " -#~ "наличен вече" +#~ "Текущият брой на промените надхвърля максималния. Текущ брой - {0}, " +#~ "максимален - {1}." #~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Активирай за качване на всички промени в една заявка, Изключи за " -#~ "използване на заявка за всяка променена примитива" - -#~ msgid "Images for {0}" -#~ msgstr "Изображения за {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Прочитане GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Не е указано време за точка {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Не е намерено изображение с информация за времето." - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS Начало: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS Край: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "текуща разлика: {0} с." - -#~ msgid "timezone difference: " -#~ msgstr "разлика в часови пояси: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} в пределите на следата" - -#~ msgid "Sync clock" -#~ msgstr "Синхронизация часовник" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Невъзможно е да се прочете датата от файла \"{0}\"" - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Липсва EXIF време във файла \"{0}\"." - -#~ msgid "Image" -#~ msgstr "Изображение" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Часова зона на GPS устойството (разлика със снимките)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Синхронизиране времето с GPS приемника" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Въведенето време не може да бъде използвано." - -#~ msgid "" -#~ "Loading of {0} plugin was requested. This plugin is no longer required." -#~ msgstr "" -#~ "Зареждането на добавката {0} беше заявено, но тя не се изисква повече." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Геомаркирани картинки" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Отваряне на изображения с AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "osmarender опции" - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "Още едно geotag разширение за JOSM. Свързва снимки с GPS следи или " -#~ "импортира EXIF гео-маркирани снимки." - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Няколко помощни инструмента, които облекчават живота: например " -#~ "опрастяване на път, присъединяване на области, прескачане до позиция." +#~ "Мога да фотографирам екрана на моя GPS приемник.
Това може ли да " +#~ "помогне?" + +#~ msgid "All images" +#~ msgstr "Всички изображения" + +#~ msgid "Images with no exif position" +#~ msgstr "Изображението няма EXIF позиция" + +#~ msgid "Not yet tagged images" +#~ msgstr "Няма още маркирани изображения" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Открити {0} съвпадения на {1} в GPX следа {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPX Следата е заредена" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Разминаване между следата и снимките: {0}мин {1}сек" + +#~ msgid "Default Values" +#~ msgstr "Стойности по подразбиране" + +#~ msgid "Enable proxy server" +#~ msgstr "Използване на прокси-сървър" + +#~ msgid "Anonymous" +#~ msgstr "Анонимно" + +#~ msgid "Proxy server host" +#~ msgstr "Адрес" + +#~ msgid "Proxy server port" +#~ msgstr "Порт" + +#~ msgid "Proxy server username" +#~ msgstr "Потребителско име" + +#~ msgid "Proxy server password" +#~ msgstr "Парола" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "Грешка! Възможно е да липсват маркери (тагове)." + +#~ msgid "Preparing data..." +#~ msgstr "Подготвяне на данните..." + +#~ msgid "Preparing..." +#~ msgstr "Подготвяне…" + +#~ msgid "Uploading..." +#~ msgstr "Качване..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Грешна парола или потребителско име." + +#~ msgid "Enter Password" +#~ msgstr "Въведете парола" + +#~ msgid "Login" +#~ msgstr "Вход" + +#~ msgid "Auto-tag source added:" +#~ msgstr "Източник на автомат.-маркери добавен:" + +#~ msgid "Interpolation" +#~ msgstr "Интерполация" + +#~ msgid "Optional" +#~ msgstr "Незадължително" + +#~ msgid "Shop" +#~ msgstr "Магазин" + +#~ msgid "aqueduct" +#~ msgstr "акведукт" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -27702,4 +28186,31 @@ #~ msgid "name" #~ msgstr "име" + +#~ msgid "Images for {0}" +#~ msgstr "Изображения за {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Прочитане GPX..." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS Начало: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "текуща разлика: {0} с." + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS Край: {0}" + +#~ msgid "timezone difference: " +#~ msgstr "разлика в часови пояси: " + +#~ msgid "Image" +#~ msgstr "Изображение" + +#~ msgid "{0} within the track." +#~ msgstr "{0} в пределите на следата" + +#~ msgid "Sync clock" +#~ msgstr "Синхронизация часовник" #~ msgid "OSM username (email)" @@ -27859,4 +28370,7 @@ #~ msgstr "Моля изберете ред за копиране." +#~ msgid "osmarender options" +#~ msgstr "osmarender опции" + #~ msgid "Metacarta Map Rectifier image id" #~ msgstr "Metacarta Map Rectifier image id" @@ -27934,4 +28448,28 @@ #~ msgid "Refresh the selection list." #~ msgstr "Обнови списъка с избраните." + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Часова зона на GPS устойството (разлика със снимките)" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Не е намерено изображение с информация за времето." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Липсва EXIF време във файла \"{0}\"." + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Не е указано време за точка {0} x {1}" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Синхронизиране времето с GPS приемника" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Въведенето време не може да бъде използвано." #~ msgid "Login name (email) to the OSM account." @@ -28129,4 +28667,10 @@ #~ msgstr "Наистина ли искате да маркирате проблема като ''решен''?" +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Геомаркирани картинки" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Отваряне на изображения с AgPifoJ..." + #~ msgid "Open a layer first (GPX, OSM, cache)" #~ msgstr "Отваряне първо на слой (GPX, OSM, кеш)" @@ -28243,4 +28787,11 @@ #~ msgid "Edit Portcullis" #~ msgstr "Редактирай падаща решетка" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Още едно geotag разширение за JOSM. Свързва снимки с GPS следи или " +#~ "импортира EXIF гео-маркирани снимки." #~ msgid "" @@ -28263,4 +28814,11 @@ #~ msgid "Directly load TCX files from JOSM." #~ msgstr "Директно зареждане на TCX файлове от JOSM." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Няколко помощни инструмента, които облекчават живота: например " +#~ "опрастяване на път, присъединяване на области, прескачане до позиция." #~ msgid "Remove route nodes" @@ -28303,4 +28861,7 @@ #~ msgstr "Проверка дали примитив {0} е заминал..." +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Невъзможно е да се прочете датата от файла \"{0}\"" + #~ msgid "API initialization failed" #~ msgstr "Неуспешна иницилизация на API" @@ -28314,7 +28875,4 @@ #~ msgid "Updates the currently selected primitives from the server" #~ msgstr "Обновява текущо избраните примитиви от сървъра." - -#~ msgid "File could not be found." -#~ msgstr "Файлът не може да бъде намерен." #~ msgid "" @@ -28379,4 +28937,11 @@ #~ msgstr "Възникна грешка при записа. Грешката е: {0}" +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Активирай за качване на всички промени в една заявка, Изключи за " +#~ "използване на заявка за всяка променена примитива" + #~ msgid "Can't search because there is no loaded data." #~ msgstr "Не може да се търси защото няма заредени данни" @@ -28424,4 +28989,9 @@ #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" #~ msgstr "Не е намерен примитив с id = {0} и версия = {1} в тази база данни" + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "Зареждането на добавката {0} беше заявено, но тя не се изисква повече." #~ msgid "Use a new changeset and close it" @@ -28477,4 +29047,10 @@ #~ "или на вашият език." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е " +#~ "наличен вече" + #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "Не е намерен примитив с id = {0} в тази база данни" Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 19198) +++ /applications/editors/josm/i18n/po/cs.po (revision 19199) @@ -4,11 +4,12 @@ # FIRST AUTHOR , 2008. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-28 22:32+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-16 20:25+0000\n" +"Last-Translator: Martin Petricek \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Vytváří se grafické rozhraní programu (GUI)" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Pomoc" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorují se nekorektní URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Varování" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoruji poškozený soubor z URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Nelze přečíst soubor ''{0}''.
Chyba:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Nelze přečíst soubor ''{0}''.
Chyba:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "O JOSM" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -277,5 +279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -284,5 +286,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -290,16 +292,23 @@ "screen with browser windows
and take some time to finish." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +"Chystáte se spustit {0} oken prohlížeče.
To může jednak zaplnit vaši " +"obrazovku mnoha okny
a může to též chvíli trvat." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Pokračovat" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -308,29 +317,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -347,5 +357,10 @@ msgstr "Zrušit" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Nepodařilo se spustit externí prohlížeč" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Prosím, vyberte alespoň jeden již nahraný uzel, cestu nebo relaci." @@ -361,5 +376,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Sloučit" @@ -379,15 +394,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Přidat uzel..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Přidat uzel zadáním zeměpisné šířky a délky." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -403,22 +418,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Úpravy: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Zadejte souřadnice nového uzlu." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Použijte desetinné stupně." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Záporné hodnoty znamenají západní, resp. jižní polokouli." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -427,5 +442,5 @@ msgstr "Zeměpisná šířka" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -434,28 +449,29 @@ msgstr "Zeměpisná délka" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +msgstr "Prosím zadejte platnou zeměpisnou šířku v rozsahu -90..90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +msgstr "Prosím zadejte zeměpisnou šířku v rozsahu -90..90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +msgstr "Prosím zadejte platnou zeměpisnou délku v rozsahu -180..180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +msgstr "Prosím zadejte zeměpisnou délku v rozsahu -180..180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -467,9 +483,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -490,18 +506,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -513,5 +529,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -533,6 +549,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -579,5 +595,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" @@ -614,14 +630,15 @@ msgstr "Není žádný konflikt, na který by se mohlo přiblížit" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Uzavřít otevřené sady změn" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Uzavře otevřené sady změn" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -631,21 +648,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Soubor: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Nejsou otevřené žádné sady změn" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Žádné otevřené sady změn" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Stahování otevřených sad změn..." @@ -729,11 +746,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -811,16 +829,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -856,5 +879,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplikovat" @@ -897,10 +920,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Exportovat do GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Exportovat data do GPX souboru." @@ -915,12 +938,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -945,8 +968,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -957,10 +980,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -973,17 +996,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1022,22 +1045,27 @@ msgstr "Zobrazit informace o OSM bodech, cestách nebo relacích." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Spojit překrývající se plochy" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Spojí plochy, které se navzájem překrývají" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Vyberte alespoň jednu uzavřenou cestu k připojení." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Aktuálně lze sloučit maximálně pouze dvě plochy." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" není uzavřená plocha a tedy nelze spojit." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1050,38 +1078,34 @@ "Opravdu chcete pokračovat?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Prosíme přerušte, pokud si nejste jisti" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Vyberte alespoň jednu uzavřenou cestu k připojení." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "Nenalezen žádný průnik. Nic se nemění." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Přidány body na všechny průsečíky" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Smazat cesty, které nejsou součástí vnižního multipolygonu." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Opravit relace." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Spojena plocha překrývající sama sebe" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Spojeny překrývající se plochy" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1091,33 +1115,33 @@ "tímto nedošlo ke vzniku chyb." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Zadej hodnoty pro všechny konflikty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Vyřešit konflikty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Opravit konflikty značek" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Prvek odstraněn z relací" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Spojit plochy: Vymazat krátké cesty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Uzavřená cesta" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Odstranit tagy z vnitřních cest" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Funkce spojení ploch" @@ -1280,5 +1304,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Nemohu přesouvat objekty mimo svět." @@ -1358,28 +1382,28 @@ msgstr "Stáhnout data" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Ortogonalizovat tvar" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1388,9 +1412,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1399,16 +1423,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Ortogonalizovat" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Využití" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "Vybrané prvny nelze uspořádat do pravých úhlů" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Ortogonalizovat" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1483,18 +1507,18 @@ msgstr "Nemohu přejmenovat soubor ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Otočit cesty" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Otočit směr všech zvolených cest" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Zvolte minimálně jednu cestu." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Otočit cesty" @@ -1503,10 +1527,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Uložit" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Uložit aktuální data." @@ -1563,10 +1587,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Uložit jako..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Uložit aktuální data do nového souboru" @@ -1611,6 +1635,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1643,5 +1666,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1706,5 +1729,5 @@ "cesty.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1715,5 +1738,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1723,5 +1746,5 @@ "být ověřeno, zda je zkopírování správné a případně opraveno." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1755,34 +1778,34 @@ msgstr "Tento uzel není přilepen k ničemu jinému." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Žádný z těchto uzlů není připojen na něco jiného." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Žádný z uzlů v této cestě není připojen na něco jiného." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Tento výběr nelze použít pro oddělení uzlů" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Vyberte buď:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Jeden otagovaný uzel, nebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Jeden uzel používaný více než jednou cestou, nebo" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1791,5 +1814,5 @@ "nebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1798,5 +1821,5 @@ "cestě." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1809,9 +1832,9 @@ "své vlastní kopie a všechny uzly budou vybrány." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Nespojený uzel" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1819,5 +1842,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1852,10 +1875,10 @@ msgstr "Odznačit vše (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Aktualizovat data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1863,53 +1886,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "Stahuji data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Nenalezena aktuální datová sada" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "V aktuální datové sadě není prvek s id {0}" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Aktualizovat výběr" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +msgstr "Aktualizuje vybrané objekty ze serveru (znovu stáhne data)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Aktualizovat výběr" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "Nejsou vybrány žádne objekty k aktualizaci." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Prázdný výběr" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Nahrát data" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1920,5 +1939,5 @@ "konflikty vyřešeny." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1926,148 +1945,7 @@ msgstr "Žádné změny k nahrání." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "Synchronizovat pouze bod {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "Synchronizovat pouze cestu {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Syncronizovat pouze relaci {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synchronizovat celý dataset" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"Aktualizace selhala, protože na serveru je novější " -"verze jednoho z vašich
bodů, cest nebo relací.
Konflikt je způsoben " -"{0} s id {1},
na serveru je verze {2}, " -"vaše verze je {3}.

Klikněte {4} pro synchronizaci " -"konfliktního prvku.
Klikněte {5} pro synchronizaci " -"kompletní lokální datové sady se serverem.
Klikněte {6} " -"pro přerušení a pokračování editace.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Objeveny konflikty" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Aktualizace selhala, protože na serveru je novější " -"verze jednoho z vašich
bodů, cest nebo relací.

Klikněte " -"{0} pro synchronizaci kompletní lokální datové sady se serverem." -"
Klikněte {1} pro přerušení a pokračování editace.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"Nahrávání selhalo protože používaná
sada změn {0} " -"byla již uzavřena na {1}.
Prosím nahrajte znovu s novou, nebo otevřenou " -"sadou změn." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Sada změn byla uzavřena" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "Bod je stále využit" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Aktualizuji prvky" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Nahrávám na server data pro vrstvu ''{0}''" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Varování: objekt ''{0}'' je na serveru již smazán. Přeskakuji tento objekt a " -"opakuji nahrávání." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "Objekt ''{0}'' je již smazán. Přeskakuji objekt při nahrávání." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "Nahrávám {0} objektů ..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2202,9 +2080,9 @@ msgstr "Stažená GPX data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Stahuji data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2213,5 +2091,5 @@ "ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "V této oblasti nebyla nalezena žádná data." @@ -2287,7 +2165,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2304,58 +2182,52 @@ "když mažete trasu. CTRL: smazat referenční objekty." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Kreslit" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Kreslit uzly" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "vybráno" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Nemůžu přidat uzel ležící mimo Zemi." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Přidat uzel" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Přidat uzel do cesty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Spojit existující cestu do uzlu" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Přidat nový uzel do již existující cesty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Přidat uzel do cesty a spojit" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Vytvořit nový uzel." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Vybrat uzel pod kurzorem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2365,14 +2237,14 @@ msgstr[2] "Vložit nový uzel do {0} cest." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Začít novou cestu od posledního uzlu." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Pokračovat v cestě od posledního uzlu." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Dokončit kreslení" @@ -2411,18 +2283,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Vybrat" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Zvol, posuň a otáčej objekty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2432,17 +2305,17 @@ msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Přesun prvků" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Přesunout je" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Vrátit zpět přesun" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2455,13 +2328,13 @@ "Opravdu přesunout?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Vždy přesunout a tento dialog již více nezobrazovat" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Pusťte myší tlačítko k vybrání obejktů v obdélníku" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2469,9 +2342,9 @@ "Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Pusťte myší tlačítko k zastavení otaáčení" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2483,5 +2356,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zvětšení" @@ -2505,5 +2378,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Hledat objekty." @@ -2595,7 +2468,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - všechny objekty změněné uživatelem" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2604,8 +2476,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - objekt s daným počtem uzlů" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:... - objekt s daným počtem uzlů" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2613,21 +2495,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - všechny změněné objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - všechny vybrané objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - všechny nekompletní objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - všechny objekty bez tagů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2635,5 +2523,5 @@ "child výraz - všechny podobjekty objektů odpovídajících výrazu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2641,20 +2529,20 @@ "parent výraz - všechny rodiče objektů odpovídajících výrazu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Použijte | nebo OR ke kombinaci s logickým \"nebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Použijte \" jako uvozovky (například pokud klíč obsahuje dvojtečku)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Použijte ( a ) k seskupení výrazů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2662,55 +2550,55 @@ msgstr "Filtrovat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Hledat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "Přidat filtr" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Začít hledání" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Nebyly nalezeny záznamy pro \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nic nebylo odstraněno výběrem hledáním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Ve výběru se nenašlo nic při hledání ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Nalezeno {0} odpovídajích výrazů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2723,40 +2611,43 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Neočekávaný token: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Chybějící argument pro \"NEBO\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Chybějící argument pro \"NOT\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Očekávám uzavírací závorku." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Chybějící argument pro \"NEBO\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2765,9 +2656,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Chybný počet parametrů pro operátor nodes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2778,7 +2669,12 @@ "čísel, například nodes:10-20." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Neplatná hodnota pro operátor id: {0}. Je očekáváno číslo." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Neplatná hodnota pro operátor id: {0}. Je očekáváno číslo." @@ -2812,43 +2708,30 @@ msgstr "Chyba při komunikaci se serverem." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Počet změn překračuje maximální počet změn. Počet změn je {0} a maximum je " -"{1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Selhal předpoklad" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" +"{0} uzlů v cestě {1} překračuje nejvyšší povolený počet uzlů v cestě {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Narušení schopností API" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Upozornění: automaticky mažu hodnotu tagu ''{0}'' na smazaném primitivu {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"Délka hodnoty tagu \"{0}\" na primitivu {1} překračuje povolenou délku {2}. " -"Délka hodnoty je {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Selhal předpoklad" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"{0} uzlů v cestě {1} překračuje nejvyšší povolený počet uzlů v cestě {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2961,5 +2844,5 @@ msgstr "Nastaveno {0}={1} pro {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2974,5 +2857,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Dvojí konflikt" @@ -3079,4 +2962,19 @@ msgstr "Vyřešení konfliktu ve stavu smazání pro {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3192,5 +3090,5 @@ msgstr "Použít ?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3274,15 +3172,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, 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:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3293,5 +3191,5 @@ "adresářem." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3300,5 +3198,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3307,5 +3205,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3314,5 +3212,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3320,5 +3218,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3327,5 +3225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3334,5 +3232,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3341,5 +3239,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3348,10 +3246,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, 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:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3359,24 +3257,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Předvolby uloženy na {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Nemohu nahrát předvolby. Důvod: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Nemohu nahrát předvolby ze serveru." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3385,5 +3283,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3415,5 +3313,5 @@ msgstr "Varování: soubor revizí ''/REVISION'' chybí." -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3435,31 +3333,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "J" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "S" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "Z" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Sada změn {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3467,5 +3358,5 @@ msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3476,27 +3367,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3504,5 +3395,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3514,5 +3405,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3520,25 +3411,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "H" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "Text" #. column header: apply filter for children +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "I" msgstr "I" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "" @@ -3546,43 +3437,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "očekáváno id >= 0. Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "objekt s id=0 nemůže být neviditelný" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "očekáváno id > 0. Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "očekávána verze > 0. Nalezena {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "očekáván parameter ''{0}'' >= 0, zadáno ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3590,5 +3493,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3616,10 +3519,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3627,7 +3526,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3642,5 +3541,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3658,146 +3557,138 @@ msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Cesta se stylem plochy není uzavřená." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Cesta v multipolygonu ''{0}'' není uzavřena." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Odstraněn prvek ''{0}'' z relace." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Cesta ''{0}'' s méně, než dvěmi body." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Nalezena více než jedna \"from\" cesta." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Nalezeno více cílových \"to\" cest." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Nalezen více než jeden \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Neznámá role ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Neznámý typ prvku pro ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Nenazezena příchozí cesta \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Nenalezena odchozí cesta \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Nenalezen \"via\" uzel nebo cesta." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Styl pro omezení {0} nenalezen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Cesty ''{0}'' a ''{1}'' se protínají." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Vnitřní cesta ''{0}'' je venku." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Ne-cesta ''{0}'' v multipolygonu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Styl pro vnější cestu ''{0}'' nesedí." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "nepopsaný" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Chyba: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Varování: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "neaktivní" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "vybráno" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3807,6 +3698,6 @@ msgstr[2] "uzly" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3816,7 +3707,8 @@ msgstr[2] "cestami" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3826,21 +3718,37 @@ msgstr[2] "relace" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "nepopsaná cesta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "nekompletní cesta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "pozadí" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "zvýraznit" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "nepopsaný" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "text" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3982,5 +3890,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "železnice" @@ -3996,7 +3904,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4014,4 +3922,10 @@ msgstr[2] "{0} prvků" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Sada změn {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4043,6 +3957,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Konflikt" @@ -4056,7 +3970,7 @@ msgstr "Objekt smazán" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4141,74 +4055,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Jméno uživatele" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Heslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "použití" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "Možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Zobrazí tuto nápovědu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Standardní unixová geometrie okna" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Stáhnout ohraničující box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Stáhnout umístění s url (obsahující lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Otevřít soubor (jako GPS trasu, pokud .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Stáhnout ohraničenou oblast jako \"raw\" GPS data" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Spustit přes celou obrazovku" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Nastavit výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Nastavit jazyk." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/CESTA/K/ADRESARI/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "Změnit adresář pro všechna uživatelská nastavení" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4221,9 +4135,9 @@ "využití ram" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "příklady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4233,36 +4147,36 @@ "selection nejprve nahrajte nějaká data." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Namísto --download= můžete zadat osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktivuji aktualizované pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Načítám dřívější pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Nastavuji výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Načítám pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Soubor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4277,22 +4191,22 @@ msgstr "Upravit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Zobrazit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Předvolby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4300,5 +4214,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Zvuk" @@ -4377,13 +4291,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "Uživatel:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "vrstva není v seznamu" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4416,5 +4331,5 @@ msgstr "Inicializace" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4424,6 +4339,6 @@ "relace." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4434,5 +4349,5 @@ "relací." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4443,5 +4358,5 @@ "relací." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4451,25 +4366,25 @@ msgstr[2] "Mažu {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "Smazat objekty" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "Ke smazání" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "Z relace" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4477,9 +4392,9 @@ msgstr "Role" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "Klikněte pro uzavření dialogu a odstranění objektu z relací" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "Klikněte pro uzavření dialogu a zrušení mazání objektů" @@ -4511,11 +4426,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4524,6 +4439,6 @@ msgstr "Značky" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4531,6 +4446,6 @@ msgstr "Body" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4538,40 +4453,40 @@ msgstr "Členové" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Nezbývají žádné další konflikty značek k vyřešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Značky({0} konfliktů)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "Zbývá {0} konfliktů značek k vyřešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Body(vyřešeno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Body(s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Nevyřešené konflikty v seznamu bodů v této cesty" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Členové(vyřešeno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4579,21 +4494,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Členi (s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "Nevyřešené konflikty v seznamu členů této relace" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Nezbývají žádné konflikty ve vlastnostech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Vlastnosti (s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Zbývající konflikty k vyřešení ve vlastnostech" @@ -4625,22 +4540,22 @@ msgstr "položka {0} nenalezena v seznamu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Porovnat " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Má verze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Seznam prvků v mé datové sadě, např v lokální datové sadě" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4648,5 +4563,5 @@ msgstr "Sloučená verze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4654,30 +4569,30 @@ msgstr "Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Cizí verze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Seznam prvků v cizí datové sadě, např v serverové datové sadě" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> vrchol" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Kopírovat mé vybrané body na začátek seznamu slučovaných bodů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> spodek" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "Kopírovat mé vybrané elementy na konec seznamu slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4685,5 +4600,5 @@ msgstr "Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4693,5 +4608,5 @@ "elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4699,9 +4614,9 @@ "Kopírovat cizí vybrané elementy na začátek seznamu slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4711,5 +4626,5 @@ "elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4719,23 +4634,23 @@ "elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Nahoru" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Posunout vybrané elementy o jednu pozici nahoru" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Dolu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Posunout vybrané elementy o jednu pozici dolu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4746,27 +4661,27 @@ msgstr "Odstranit" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Blokovat" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Blokovat" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Blokovat aktuání seznam slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Odblokovat" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Odblokovat aktuání seznam slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4777,5 +4692,5 @@ "položek" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4786,5 +4701,5 @@ "položek" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4794,5 +4709,5 @@ msgstr[2] "Má verze ({0} položek)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4802,5 +4717,5 @@ msgstr[2] "Sloučená verze ({0} položek)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4810,5 +4725,5 @@ msgstr[2] "Cizí verze ({0} položek)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4820,5 +4735,5 @@ "nastavení synchronizácie." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5061,10 +4976,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5074,10 +4989,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5162,9 +5077,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Aplikovat" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5172,6 +5087,6 @@ msgstr "nic" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "všechny" @@ -5261,7 +5176,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5272,6 +5187,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5380,4 +5295,61 @@ msgstr "Zobrazit pouze tagy s konfliktem" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Smazat označené objekty" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +#, fuzzy +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" +"Vybrat pro stažení dat do nové vrstvy.
Jinak jsou data stažena do " +"aktivní vrstvy." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Sada změn" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "Nahrát seznam vašich otevřených sad změn ze serveru" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +#, fuzzy +msgid "Select all objects assigned to the currently selected changesets" +msgstr "Zavřít zvolenou otevřenou sadu změn" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Stáhnout" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Stáhnout data z OSM serveru" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Zavřít vybrané otevřené sady změn" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Zobrazit informace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Otevřít editor pro zvolenou relaci" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5391,12 +5363,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5414,13 +5386,13 @@ msgstr "Zásobník příkazů: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "Vyřešit konflikty." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Vyřešit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5428,6 +5400,6 @@ "seznamu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5435,25 +5407,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Zrušit řešení konfliktu a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Aplikovat řešení konfliktů a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Aplikovat řešení" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "Přesto zavřít" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "Pokračovat v řešení" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5465,26 +5437,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "Konflikt není vyřešen kompletně" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Vyřešit konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Vyřešit konflikty pro ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "Filtruje objekty a schová/zneaktivní je." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5495,41 +5467,41 @@ msgstr "Přidat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "Přidat filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "Upravit filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "Smazat filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "Přesunout filtr nahoru." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "Přesunout filtr dolu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "Aktivovat filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "Skrýt elementy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "Aplikovat také na potomky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "Negovat filtr" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "Mód filtrování" @@ -5568,5 +5540,5 @@ msgstr "Zobrazit historii vybraných objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "Dialog nebyl zatím vytvořen. Zavolejte nejprve createInstance()" @@ -5581,34 +5553,34 @@ msgstr "Otevřít seznam všech nahraných vrstev." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Smazat označenou vrstvu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Zobrazit/Skrýt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Přepnout viditelnost zvolené vrstvy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Aktivovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Aktivovat vybranou vrstvu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Sloučit tuto vrstvu do jiné vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Přesunout zvolenou vrstvu o řádek nahoru." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Přesunout zvolenou vrstvu o řádek dolů." @@ -5618,5 +5590,180 @@ msgstr "Informace o vrstvě" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Otevřít seznam všech relací" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relace: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Otevřít editor pro zvolenou relaci" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Smazat vybrané relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Vytvořit novou relaci" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +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ě" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "Nastavit aktuální výběr na seznam vybraných relací" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "Vybrat členy všech vybraných relací" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "Vybrat členy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "Stáhnout všechny členy vybraných relací" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "Stáhnout členy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Současný výběr" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Otevřít okno s výběrem." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Přiblížit na zvolené prvky" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Přiblížit na výběr" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Výběr: Rel.:{0} / Cest:{1} / Uzlů:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Výběr" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Výběr: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Vytrhnout panel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Zavřít tento panel. Můžete jej znovu otevřít tlačítky v levém panelu " +"nástrojů." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Minimalizovat nebo maximalizovat obsah panelu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Autoři" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Otevřít seznam lidí, kteří pracuji na zvoleném objektu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} Autor" +msgstr[1] "{0} Autoři" +msgstr[2] "{0} Autorů" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "Vybrat objekty nahrané tímto uživatelem" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "Spustit prohlížeč s informacemi o uživateli" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" +"Upozornění: spouštím prohlížeč pouze pro prvních {0} z {1} zvolených " +"uživatelů" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "Chybějící kódování" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Objekty" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "nekompletní" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "uzavřená cesta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Stahuji sady změn..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5625,22 +5772,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Změnit hodnoty ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5650,5 +5797,5 @@ msgstr[2] "Změnit vlastnosti až {0} objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5658,231 +5805,71 @@ msgstr[2] "Toto změní až {0} objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Prosím zvolte klíč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Vyberte prosím hodnotu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Vyberte objekty, u kterých chcete změnit vlastnosti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Vlastnosti/Členství" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Vlastnosti pro zvolené objekty" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Přidat vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Vlastnosti: {0} / Členství: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Vlastnosti / Členství" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Změnit relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Odstranit z relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Opravdu smazat výběr z relace {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Smaže zvolený klíč ve všech objektech" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Smazat vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Přidat nový pár klíč/hodnota ke všem objektům" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Otevřít seznam všech relací" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relace: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Otevřít editor pro zvolenou relaci" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Smazat vybrané relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Vytvořit novou relaci" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -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ě" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "Nastavit aktuální výběr na seznam vybraných relací" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "Vybrat členy všech vybraných relací" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "Vybrat členy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "Stáhnout všechny členy vybraných relací" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "Stáhnout členy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Současný výběr" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Otevřít okno s výběrem." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Přiblížit na zvolené prvky" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Přiblížit na výběr" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Výběr: Rel.:{0} / Cest:{1} / Uzlů:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Výběr" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Výběr: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Vytrhnout panel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Zavřít tento panel. Můžete jej znovu otevřít tlačítky v levém panelu " -"nástrojů." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Minimalizovat nebo maximalizovat obsah panelu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Autoři" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Otevřít seznam lidí, kteří pracuji na zvoleném objektu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} Autor" -msgstr[1] "{0} Autoři" -msgstr[2] "{0} Autorů" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "Vybrat objekty nahrané tímto uživatelem" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Zobrazit informace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "Spustit prohlížeč s informacemi o uživateli" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" -"Upozornění: spouštím prohlížeč pouze pro prvních {0} z {1} zvolených " -"uživatelů" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "Chybějící kódování" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Autor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Objekty" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5946,20 +5933,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Stáhnout všechny nekompletní cesty a uzly v relaci" -msgstr[1] "Stáhnout všechny nekompletní cesty a uzly v relaci" -msgstr[2] "Stáhnout všechny nekompletní cesty a uzly v relaci" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Stáhnout členy relace" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Stahování relace {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -5977,14 +5962,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Aplikovat roli" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Zadat roli všech členů relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5996,14 +5979,14 @@ "provést s touto cyklickou závislostí?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "Odstranit, vyčistit relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "Ignorovat, ponechat relaci jak je" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -6015,9 +5998,9 @@ "''{0}''

Opravdu chcete přidat dalšího člena relace?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 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:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -6030,10 +6013,10 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 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:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -6041,5 +6024,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:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -6049,5 +6032,5 @@ "člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -6057,20 +6040,20 @@ "člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "Editor relací: Odstranit vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 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:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6079,70 +6062,69 @@ 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:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "Vybrat prvky pro vybrané členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "Seřadit členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Sport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "Řadit" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "Editor relací: Třídění" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "Editor relací: Posun nahoru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "Editor relací: Posun dolů" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 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:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "Editor relací: Odstranit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "Smazat editovanou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 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:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "Ne, pokračovat v editaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6151,9 +6133,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "Konflikt v datech" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6162,49 +6144,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "Aplikovat aktuální změny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 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:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 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:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Přidat prázdnou značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Stáhnout členy relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Stáhnout prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "Editor relací: Stáhnout členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "Stáhnout členy relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "Nastaví roli pro vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Aplikovat roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6216,34 +6196,34 @@ "role těchto prvků.
Opravdu chcete novou roli aplikovat?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "Ano, aplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "Ne, neaplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "Potvrdit prázdnou roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 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/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "Zvětšit na" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "Zvětšování je neaktivní protože je neaktivní vrstva s touto relací" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "Zvětšování je neaktivní protože nebyl vybrán žádný člen" @@ -6356,10 +6336,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "Zadejte prosím název záložky stahované oblasti." #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "Jméno lokace" @@ -6369,5 +6349,5 @@ msgstr "Odstranit vybrané záložky" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "Přejmenovat vybranou záložku" @@ -6453,9 +6433,4 @@ msgid "Download Area" msgstr "Stáhnout plochu" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Stáhnout" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6754,6 +6729,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6766,6 +6739,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -7036,4 +7007,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7256,5 +7231,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7297,116 +7272,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Název" @@ -7430,15 +7405,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "Blízko" @@ -7626,10 +7601,10 @@ msgstr "Znovu nahrát historii ze serveru" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7637,5 +7612,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7643,9 +7618,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7760,6 +7735,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "neznámý" @@ -7781,13 +7756,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Changeset info" msgstr "Informace o sadě změn" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Launch browser with information about the changeset" msgstr "Spustit prohlížeč s informacemi o sadě změn" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7822,4 +7797,131 @@ msgstr "Verze" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Synchronizovat pouze bod {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Synchronizovat pouze cestu {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Syncronizovat pouze relaci {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synchronizovat celý dataset" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Aktualizace selhala, protože na serveru je novější " +"verze jednoho z vašich
bodů, cest nebo relací.
Konflikt je způsoben " +"{0} s id {1},
na serveru je verze {2}, " +"vaše verze je {3}.

Klikněte {4} pro synchronizaci " +"konfliktního prvku.
Klikněte {5} pro synchronizaci " +"kompletní lokální datové sady se serverem.
Klikněte {6} " +"pro přerušení a pokračování editace.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Objeveny konflikty" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Aktualizace selhala, protože na serveru je novější " +"verze jednoho z vašich
bodů, cest nebo relací.

Klikněte " +"{0} pro synchronizaci kompletní lokální datové sady se serverem." +"
Klikněte {1} pro přerušení a pokračování editace.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"Nahrávání selhalo protože používaná
sada změn {0} " +"byla již uzavřena na {1}.
Prosím nahrajte znovu s novou, nebo otevřenou " +"sadou změn." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Sada změn byla uzavřena" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "Bod je stále využit" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Napište stručný komentář ke změnám, které nahráváte na server:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "Zadejte komentář k nahrávání (min. 3 znaky)" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7838,39 +7940,149 @@ msgstr "Žádná otevřená sada změn" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Otevřít novou sadu změn" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "Otevřít novou sadu změn a použít ji v dalším nahrávání" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Aktualizuji sadu změn..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Nahrát data do již otevřené sady změn" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "Zavřít sadu změn po nahrání." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "Vybrat pro zavření sady změn po následujícím nahrání" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "Nahrát seznam vašich otevřených sad změn ze serveru" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "Zavřít zvolenou otevřenou sadu změn" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "Prosím vyberte sadu změn kterou chcete uzavřít" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "Otevřené sady změn" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Zavřít sady změn" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "Zavřít vybrané otevřené sady změn" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "Zrušit zavírání sad změn" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Uzavírám sadu změn" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "Zavírám sadu změn {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Uložit uživatelské jméno a heslo (nezašifrované)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Zadejte uživatelské jméno" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Prosím zadejte tagy o vaší trase" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Upozornění: heslo je posíláno nezašifrované." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Atletika" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Dosažena křižovatka" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "Vyberte soubor" @@ -7939,17 +8151,17 @@ msgstr "Ukládám vrstvu do ''{0}'' ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "Neuložené změny - Uložit/nahrát na server před ukončením?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "Neuložené změny - Uložit/nahrát na server před smazáním?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "Ukládám a nahrávám na server změněné vrstvy ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7962,9 +8174,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "Neuložená data a konflikty" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7978,9 +8190,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "Neuložená data a chybějící přiřazený soubor" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7995,33 +8207,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "Zavřít tento dialog a pokračovat v editování v JOSM" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Neuložit změny a ukončit" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "Ukončit JOSM bez ukládání. Neuložené změny budou ztraceny." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "Zahodit a smazat" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "Smazat vrstvy bez ukládání. Neuložené změny budou ztraceny." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "Uložit/nahrát na server a skončit" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" @@ -8029,9 +8241,9 @@ "uloženy." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "Uložit/nahrát na server a smazat" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" @@ -8039,10 +8251,10 @@ "ztraceny." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "Připravuji vrstvu ''{0}'' pro nahrání na server ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -8052,5 +8264,5 @@ "nebo selhalo." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "Nekompletní nahrávání a/nebo ukládání" @@ -8123,40 +8335,393 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Nahrát na server" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Aktualizovat objekty" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Nastavení" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "Tagy nové sady změn" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "Otevřít novou sadu změn a použít ji v dalším nahrávání" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "pro zkušené (černá)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Nastavení dostupných pluginů." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Nahrávám na server data pro vrstvu ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Nahrát změny na server" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "Nahrát změněné objekty" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Prosím zadejte komentář k nahrávání této sady změn (min. 3 znaky)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "Neplatný komentář k nahrávání" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "Zrušit nahrávání na server a pokračovat v editaci" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Značky sady změn {0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" +"Varování: prvek ''{0}'' byl již na serveru smazán. Přeskakuji tento prvek a " +"opakuji přenos." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "Připravuji objekty k nahrání na server ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, fuzzy, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +"Prosím potvrďte odstranění {0} objektů z {1} " +"relací." +msgstr[1] "" +"Prosím potvrďte odstranění {0} objektů z {1} " +"relací." +msgstr[2] "" +"Prosím potvrďte odstranění {0} objektů z {1} " +"relací." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Nahrávám na server data pro vrstvu ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "Pokračovat v nahrávaní" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +#, fuzzy +msgid "Click to return to the Upload Dialog" +msgstr "Klikněte pro zavření dialogu" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "O aplikaci" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Klikněte pro zrušení a návrat k editaci" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Vybrat objekty k nahrání na server" +msgstr[1] "Vybrat objekty k nahrání na server" +msgstr[2] "Vybrat objekty k nahrání na server" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Informace o sadě změn" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Varování: objekt ''{0}'' je na serveru již smazán. Přeskakuji tento objekt a " +"opakuji nahrávání." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "Objekt ''{0}'' je již smazán. Přeskakuji objekt při nahrávání." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "Nahrávám {0} objektů ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "Vybrat objekty k nahrání na server" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "Ukončit nahrávání" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Zvolte řádek k vymazání" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "Otevřít novou sadu změn a použít ji v dalším nahrávání" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Objekty k přidání:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Objekty ke změnění:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Objekty ke smazání:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8166,5 +8731,5 @@ msgstr[2] "{0} objektů k přidání:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8174,5 +8739,5 @@ msgstr[2] "{0} objektů k úpravě:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8182,213 +8747,37 @@ msgstr[2] "{0} smazaných objektů:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Nahrát změny na server" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "Nahrát změněné objekty" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "Prosím zadejte komentář k nahrávání této sady změn (min. 3 znaky)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "Neplatný komentář k nahrávání" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Prosím zadejte nejdříve pozadovanou pozici" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "Zrušit nahrávání na server a pokračovat v editaci" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Napište stručný komentář ke změnám, které nahráváte na server:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "Zadejte komentář k nahrávání (min. 3 znaky)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "Otevřít novou sadu změn" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "Otevřít novou sadu změn a použít ji v dalším nahrávání" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "Použít otevřenou sadu změn" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Nahrát data do již otevřené sady změn" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "Zavřít sadu změn po nahrání." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "Vybrat pro zavření sady změn po následujícím nahrání" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Značky sady změn {0}" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "Nahrát seznam vašich otevřených sad změn ze serveru" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "Zavřít zvolenou otevřenou sadu změn" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "Sada změn s ID > 0 očekávána. Nalezeno {0}." - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Varování: prvek ''{0}'' byl již na serveru smazán. Přeskakuji tento prvek a " -"opakuji přenos." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "Připravuji objekty k nahrání na server ..." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "Vybrat objekty k nahrání na server" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "Ukončit nahrávání" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "Pokračovat v nahrávaní" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "Chyba: neočekávaná řádka ''{0}'' v souboru záložek ''{1}''" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Nahrát všechny změny v jednom požadavku" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "Špatný požadavek" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} metrů" -msgstr[1] "{0} metrů" -msgstr[2] "{0} metrů" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Prosím zadejte řetězec filtru" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, fuzzy, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "Do souboru ''{0}'' nelze zapisovat. Prosíme, vyberte jiný soubor." - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps bod" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Přizpůsobit kreslení linií" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Použít globální nastavení." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Kreslit spojnice mezi body v této vrstvě" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Nereslit spojnice mezi body v této vrstvě" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8396,5 +8785,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8403,5 +8792,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8483,5 +8872,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Popis" @@ -8515,10 +8904,10 @@ msgstr[2] "{0} značek" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Převést do datové vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8528,12 +8917,12 @@ "
Pokud chcete nahrát trasy, podívejte se tady:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8542,29 +8931,29 @@ msgstr "Převedeno z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Stáhnout data z OSM podél této trasy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Stáhnout vše v rozmezí:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} metrů" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Maximální plocha na požadavek:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} čtverečních km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8575,9 +8964,9 @@ "pokračovat?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8585,5 +8974,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8593,23 +8982,23 @@ "byly vynechány." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "mimo stažený areál" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "verze {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8619,5 +9008,5 @@ msgstr[2] "Bylo nalezeno {0} konfliktů." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8638,5 +9027,5 @@ "objektů
z lokální datové sady protože byly vymazány na serveru." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8656,11 +9045,11 @@ "vyřešte je manuálně." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "Klikněte pro uzavření tohoto dialogu a návrat k editaci" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8670,36 +9059,36 @@ msgstr[2] "{0} smazáno" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} se skládá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "nenastaveno" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "Verze API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Převédst do GPX vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8707,5 +9096,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8714,5 +9103,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8721,5 +9110,5 @@ msgstr[2] "body" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8729,5 +9118,5 @@ msgstr[2] "trasy s {0} body" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8737,5 +9126,5 @@ msgstr[2] "{0} se skládá z {1} tras" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8745,24 +9134,24 @@ msgstr[2] "{0} bodů" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Soubory GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Soubor {0} je načten pod jménem \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Chyba při parsování {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Nemůžu číst \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8774,34 +9163,34 @@ "pásmo

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Čas fotografie (z exif):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Čas GPS (načten z předchozích fotografií): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/rrrr hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Jsem v časovém pásmu: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Žádné datum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Otevřít další fotografie" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synchronizovat čas z fotografie GPS přijímače" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8811,69 +9200,156 @@ "Prosíme, použijte požadvaný formát" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Neplatné datum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX trasa: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Otevřít jinou GPX trasu" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Auto-odhad" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Aktualizovat pozici pro: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Časové pásmo: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Posun:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "Mohu vyfotit můj GPS přijímač.
Může to pomoci?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Aktualizovat pozici pro: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Všechny obrázky" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Obrázky bez exif pozice" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Neotagované obrázky" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Nic není zvoleno!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "{0} z {1} fotografií bylo dosazeno do GPX trasy." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Korelovat obrázky s GPX trasou" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Korelovat" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-odhad" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Nepatné časové pásmo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Neplatný posun" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Stopování" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Časová zóna: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Minuty: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekundy: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Časový rozdíl {0} dnů)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "Dosazení fotografií do trasy selhalo." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Upravit časovou zónu a posun" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "Zvolené fotografie neobsahují informace o čase." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Fotografie neobsahují informace o čase" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX trasa neobsahuje časové údaje" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "Měli byste vybrat GPX trasu" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "Není vybrána GPX trasa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8884,9 +9360,5 @@ "Očekávaný formát: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Nepatné časové pásmo" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8897,134 +9369,56 @@ "Očekávaný formát: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Neplatný posun" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Nalezeno {0} shod s {1} v GPX trase {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Nahrána GPX trasa" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Zvolené fotografie neobsahují informace o čase." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Fotografie neobsahují informace o čase" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX trasa neobsahuje časové údaje" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Časová zóna: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minuty: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekundy: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "{0} z {1} fotografií bylo dosazeno do GPX trasy." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Časový rozdíl {0} dnů)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Posun mezi trasou a fotografiemi: {0}m {1}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Dosazení fotografií do trasy selhalo." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Upravit časovou zónu a posun" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Výchozí hodnoty" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Extrahovat pozice GPS z EXIFu" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Začínam prohledávat adresář" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Načíst fotografie..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Čtu {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Nemohu najít výchozí cesto pro adresář {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Prohledávám adresář {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Nalezen nulový soubor v adresáři {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Chyba při získávání souborů z adresáře {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Obrázky s GPS souřadnicemi" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Korelovat vůči GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -9033,52 +9427,100 @@ msgstr[2] "obrázky" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "Bylo nalezeno {0} fotografií s GPS tagem." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Vždy přesunout a tento dialog již více nezobrazovat" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Soubor nebyl nalezen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Žádný obrázek." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Nahrávám {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Chyba v souboru {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Zobrazit geotagované fotografie" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Předchozí" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Předchozí obrázek" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Webová stránka: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Odebrat fotografii z vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Odstranit z relace" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Další" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Další obrázek" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Centrovat pohled" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -9089,5 +9531,5 @@ "Výška: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9188,4 +9630,12 @@ msgstr "Chyba při zobrazování URL" +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" @@ -9397,7 +9847,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Všechny" @@ -9467,6 +9916,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Cyklisté" @@ -9727,5 +10176,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113 msgid "Looking up available translations..." -msgstr "" +msgstr "Vyhledávám dostupné překlady ..." #: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196 @@ -9858,31 +10307,94 @@ msgstr "Projekce {0} nemohla být aktivována. Používam Mercator." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Používat proxy server" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonymní" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Hostel" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Port:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Heslo" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Nastavení proxy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Adresa proxy serveru" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Port proxy serveru" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Uživatelské jméno pro proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Heslo pro proxy" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "Základní URL OSM serveru (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "Přihlašovací jméno (e-mail) k účtu OSM." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo ukládat." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "URL serveru" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "Uživatelské jméno (e-mail)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM heslo" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním souboru." +"
Heslo je jako text přenášeno na server a je součástí URL." +"
Nepoužívejte hesla která chcete utajit." #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9970,13 +10482,13 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" -msgstr "" +msgstr "Přidat novou cestu pro ikony" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" -msgstr "" +msgstr "Odstranit vybrané cesty pro ikony" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" -msgstr "" +msgstr "Upravit vybrané cesty pro ikony" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 @@ -10164,5 +10676,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10173,13 +10685,13 @@ msgstr[2] "Odstranit staré klíče z {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "Přidat nový tag" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "Smazat vybrané prvky v seznamu tagů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10187,18 +10699,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Volitelné atributy:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "uzavřená cesta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Neznámý typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10209,16 +10721,16 @@ msgstr "Nelze načíst zdroj přednastavených tagů: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Chyba parsování {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Objekty typu {0} nejsou podporovány." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10228,18 +10740,18 @@ msgstr[2] "Změnit {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Nic není zvoleno!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Vybrány nevhodné objekty!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Aplikovat přednastavení" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Změnit vlastnosti" @@ -10268,4 +10780,13 @@ msgstr "Stahuji body {0} až {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +#, fuzzy +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" +"Neplatná hodnota pro atribut ''{0}'' na XML tagu ''{1}''. Nalezeno {2}." + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10281,12 +10802,69 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, pravděpodobně chybí některé tagy." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Připravuji data..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, fuzzy, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" +"neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +#, fuzzy +msgid "Parsing response from server..." +msgstr "Dotazuji se jmeného serveru ..." + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "neočekávané číslo sloupce {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10389,10 +10967,10 @@ msgstr "Chyba parsování: Chybná struktura GPX dokumentu" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "Neznámý režim {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -10400,6 +10978,6 @@ "v lokální datové sadě neexistuje prvek s id {0}. Nelze odvodit typ prvku" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10409,40 +10987,40 @@ msgstr "Stahuji OSM data..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Stahuji uzel s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Stahuji cestu s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Stahuji relaci s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Pro id {0} server odpověděl kódem 404. Přeskakuji." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Stahuji balík uzlů z ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Stahuji balík cest z ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Stahuji balík relací z ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10452,11 +11030,10 @@ "pro každý prvek" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Stahuji body {0} až {1}..." -msgstr[1] "Stahuji body {0} až {1}..." -msgstr[2] "Stahuji body {0} až {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10493,34 +11070,32 @@ msgstr "NMEA import selhal!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "Tato verze JOSM není kompatibilní s nakonfigurovaným serverem." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"Podporuje protokol verzí 0.5 a 0.6, přičemž server hlásí podporu od {0} do " -"{1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Komunikace s {0} zahájena za použití protokolu verze {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "neočekávaný formát id získaný ze serveru, získáno ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10529,66 +11104,77 @@ "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "Vytvářím sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Úspěšně otevřená sada změn {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "Sada změn s ID > 0 očekávána. Nalezeno {0}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Aktualizuji sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "Aktualizuji sadu změn {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Zavírám sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Není k dizpozici sada změn pro rozdílový upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Připravuji..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Nahrávám..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Začínám nahrávat vše v jednom požadavku ..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Nahrávám {0} objektů ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "Čekám 10 sekund ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Zkusím nový pokus, {0} z {1}, během {2} sekund ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "OK - další pokus." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "Zahajuji pokus {0} z {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "Aktuální sada změn je prázdná. Nelze nahrávat data na server." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "ID aktuální sady změn musí být větší než 0. Aktuální ID je {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10615,4 +11201,14 @@ msgid "Invalid bz2 file." msgstr "poškozený bz2 soubor." + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10623,5 +11219,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10648,5 +11244,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10654,5 +11250,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10665,5 +11261,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10674,61 +11270,6 @@ msgstr "Načítám seznam sad změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Nesprávné heslo nebo uživatelské jméno" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Upozornění: heslo je posíláno nezašifrované." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Uložit uživatelské jméno a heslo (nezašifrované)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Zadejte heslo" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Přihlásit se" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "Základní URL OSM serveru (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "Přihlašovací jméno (e-mail) k účtu OSM." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo ukládat." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "URL serveru" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "Uživatelské jméno (e-mail)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM heslo" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním souboru." -"
Heslo je jako text přenášeno na server a je součástí URL." -"
Nepoužívejte hesla která chcete utajit." - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10825,5 +11366,12 @@ msgstr "Soubor \"{0}\" neexistuje" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10834,19 +11382,19 @@ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "Nalezen XML element jinde, než jako přímý potomek elementu " -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Chybějící povinný atribut ''{0}'' na v cestě {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "Neplatná hodnota atributu ''ref'' elementu . Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" @@ -10854,20 +11402,20 @@ "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "Chybějící atribut ''ref'' na členu v relaci {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "Neplatná hodnota atributu ''ref'' na členu v relaci {0}. Nalezeno {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Chybějící atribut ''type'' na členu {0} v relaci {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10876,19 +11424,19 @@ "Neplatná hodnota atributu ''type'' na členu {0} v relaci {1}. Nalezeno {2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Nekompletní specifikace s ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Neplatný objekt s id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10898,8 +11446,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10909,25 +11457,42 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Neznámá, nebo nepodporovaná verze API. Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "Chybějící atribut ''version'' na OSM objektu s id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" +"Neplatná hodnota pro atribut ''{0}'' na XML tagu ''{1}''. Nalezeno {2}." + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "Chybějící povinný atribut ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10935,5 +11500,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10942,5 +11507,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10948,5 +11513,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10955,13 +11520,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Připravuji OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "Zpracovávám OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "Připravuji data..." @@ -10974,5 +11539,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 msgid "Downloading from OSM Server..." -msgstr "" +msgstr "Stahuji z OSM serveru..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 @@ -10984,20 +11549,33 @@ msgstr "Stahování odkazovaných relací ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "Načítám sady změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "Stahuji sady změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "Načítám sadu změn {0} ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." +msgstr "Stahuji sadu změn {0} ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Stahuji sady změn..." +msgstr[1] "Stahuji sady změn..." +msgstr[2] "Stahuji sady změn..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." msgstr "Stahuji sadu změn {0} ..." @@ -11017,7 +11595,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}" +msgstr "Očekávaná hodnota > 0 pro parametr ''{0}'', nalezeno {1}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -11026,9 +11604,5 @@ msgstr "Nepodařilo se navázat spojení s API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "Chyba: nepodařilo se přidat přihlašovací udaje do připojení." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11082,21 +11656,25 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}" +msgstr "Hodnota >0 je očekávaná pro parametr ''{0}'', nalezeno {1}" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 -#, fuzzy msgid "Starting to upload in chunks..." -msgstr "Začínám nahrávat vše v jednom požadavku ..." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 -#, fuzzy, java-format +msgstr "Začínám nahrávat po částech..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format msgid "({0}/{1}) Uploading {2} objects..." -msgstr "Nahrávám {0} objektů ..." +msgstr "({0}/{1}) Nahrávám {2} objektů..." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Nahrávám data na serevr ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Smazané nebo přesunuté prvky" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11131,5 +11709,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64 msgid "Please restart JOSM." -msgstr "" +msgstr "Prosím restartujte JOSM." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82 @@ -11139,12 +11717,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Smazat {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Chyba při mazání souboru pluginu: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11173,5 +11751,5 @@ #, java-format msgid "Plugin {0} is no longer necessary and has been deactivated." -msgstr "" +msgstr "Plugin {0} již není potřeba a byl deaktivován." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84 @@ -11208,5 +11786,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Skip update" -msgstr "" +msgstr "Vynechat aktualizaci" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 @@ -11292,9 +11870,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "není zádný popis" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Více detailů" @@ -11425,5 +12003,20 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120 msgid "You've encountered a bug in JOSM" -msgstr "" +msgstr "Narazili jste na chybu v JOSM" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, fuzzy, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "Očekávaná hodnota > 0 pro parametr ''{0}'', nalezeno {1}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "Očekávaná hodnota > 0 pro parametr ''{0}'', nalezeno {1}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 @@ -11459,4 +12052,6 @@ "already been closed." msgstr "" +"Nepodařilo se uzavřít sadu změn {0}
protože je již " +"uzavřená." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 @@ -11466,4 +12061,6 @@ "already been closed on {1}." msgstr "" +"Nepodařilo se uzavřít sadu změn {0}
protože je již " +"uzavřená od {1}." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 @@ -11724,6 +12321,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Nahrát trasy na server" @@ -11809,5 +12406,5 @@ msgstr "Nahrávám GPX trasu na server" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Nahraje trasy na openstreetmap.org" @@ -11818,5 +12415,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Interpolace adres" @@ -11831,11 +12428,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Liché" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Sudé" @@ -11846,24 +12440,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Číslo" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "přírodní" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "místo" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Půjčovna" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11881,7 +12471,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "vnitřní část" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11947,7 +12536,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 -#, fuzzy msgid "Expected valid number for address increment" -msgstr "Očekávána lichá čísla pro adresy" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 @@ -11995,5 +12583,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "Vybrat Feuille" @@ -12057,21 +12645,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Vybrat commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Vyberte z..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Katastr" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Automatické zdrojování" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12084,13 +12672,13 @@ "Chcete používat F11 pro grabování pluginem?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12115,17 +12703,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Zapnout automatické cachování." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Max. velikost cache (v MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12137,19 +12725,19 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "WMS francouzského katastru" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" "Hodnota klíče \"source\" pokud je zapnuto automatické zdrojování" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Zdroj" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12158,5 +12746,5 @@ "Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12166,54 +12754,51 @@ "texty na tmavém pozadí." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Povolit skládání více vrstev" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Nastavení průhlednosti WMS vrstvy. Vpravo je neprůhledné, vlevo průhledné." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Zobrazovat rámeček kolem dat stažených z WMS serveru." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Stahovat menší obrázky (lepší kvalita, ale používá více paměti)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Fixní velikost čtverce (výchozí je 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fixní velikost (od 25 do 1000 metrů)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Nejstarší soubory jsou automaticky smazány při překročení této velikosti" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Přidat \"source=...\" k objektům?" @@ -12421,5 +13006,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Umístění" @@ -12619,5 +13204,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Nebyla načtena žádná data." @@ -12639,9 +13224,9 @@ msgstr "Konvertovat do GPX vrstvy s anonymizací času" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "Upravit trasu GPX" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "UpravitGpx" @@ -13030,7 +13615,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "voda" @@ -13191,19 +13776,19 @@ msgstr "Nemohu získat obrázek" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Navazuji spojení" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Připojeno" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Nepřipojeno" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Připojení selhalo" @@ -13242,32 +13827,32 @@ msgstr "LiveGPS vrstva" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Nahrát GPS záznam" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "Spoj se s gpsd serverem a ukaž aktuální pozici v LiveGPS vrstvě." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Vystředit jednou" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Vystředit vrstvu LiveGPS na současnou pozici." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Automaticky vystředit" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Udržovat vrstvu LiveGPS vystředěnou na současné pozici." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13318,9 +13903,9 @@ msgstr "Nelze kreslit mimo svět." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "režim měření" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Měření" @@ -13358,5 +13943,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13367,13 +13952,13 @@ msgstr "Vytvořit multipolygon." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "Jedna z vybraných cest je již součástí jiného multipolygonu." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "Multipolygon se musí skládat pouze z uzavřených cest." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "Musíte vybrat alespoň dvě cesty." @@ -13526,5 +14111,5 @@ msgstr "Spustitelný soubor Firefoxu" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13619,5 +14204,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13693,41 +14278,41 @@ msgstr "Zadejte jednotky váhy" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Aktuální mapa" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Nahrát dlaždici" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Nahrát všechny dlaždice" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Zvětšit přiblížení" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Zmenšit přiblížení" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "Vyprázdnit cache dlaždic" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "obrázek " @@ -13900,4 +14485,43 @@ msgstr "Je třeba zadat zdroje předvoleb v konfiguraci." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Sudé" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Nejnižší domovní číslo" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Nejvyšší domovní číslo" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Ulice" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Nejvyšší domovní číslo" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13916,42 +14540,20 @@ msgstr "Obrátit řadu domů" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Řada budov" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Vytvoří jednotlivé budovy z dlouhého bloku budov." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Vyberte jednu uzavřenou cestu z alespoň čtyř uzlů" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Řada domů" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Nejvyšší domovní číslo" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Nejnižší domovní číslo" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolace" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Jméno ulice" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Volitelné" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13966,5 +14568,5 @@ msgstr "Žádné chyby při kontrole" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Mřížka" @@ -14623,38 +15225,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "budova" @@ -14668,5 +15240,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "oblast" @@ -14781,10 +15353,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Walking Papers: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15521,6 +16093,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Číslo" @@ -15966,5 +16538,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Šířka (metrů)" @@ -16082,5 +16654,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "kov" @@ -16092,5 +16664,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "Prales" @@ -16348,4 +16920,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16377,8 +16952,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "ano" @@ -16526,9 +17103,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "ne" @@ -16773,5 +17351,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "obytná oblast" @@ -16806,5 +17384,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "obslužná cesta" @@ -16838,6 +17416,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "konstrukce" @@ -16887,5 +17465,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "kruhový objezd" @@ -17073,6 +17651,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "turistická stezka" @@ -17193,5 +17771,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17217,4 +17794,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17224,15 +17802,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operátor" @@ -17444,7 +18022,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Nadmořská výška" @@ -17863,5 +18441,5 @@ msgstr "močál" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17871,5 +18449,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "mokřina" @@ -18395,32 +18973,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Otevírací doba" @@ -18479,91 +19057,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "24/7" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "Po-Pá 08:30-20:00" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Út-Ne 08:00-15:00; So 08:00-12:00" @@ -18578,5 +19156,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18595,7 +19173,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Číslo záchodu" @@ -18611,5 +19189,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "podzemní" @@ -18622,6 +19200,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Poplatek" @@ -18660,22 +19238,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Obchod" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Upravit obchod s auty" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Opravna" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Upravit autoopravnu" @@ -18683,5 +19249,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Půjčovna" @@ -18690,10 +19256,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Upravit půjčovnu aut" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Sdílení" @@ -18701,5 +19267,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "̈́Upravit sdílení aut" @@ -18707,10 +19273,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Upravit parkoviště pro kola." #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Kapacita" @@ -18719,22 +19285,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Upravit půjčovnu kol" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Upravit prodejnu kol" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Hromadná doprava" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18744,5 +19303,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18750,5 +19309,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Reference" @@ -18756,5 +19315,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Železniční zastávka" @@ -18762,5 +19321,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Upravit železniční zastávku" @@ -18768,5 +19327,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Tramvajová zastávka" @@ -18775,5 +19334,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Upravit tramvajovou zastávku" @@ -18781,5 +19340,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Železniční nástupiště" @@ -18788,5 +19347,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Upravit železniční nástupiště" @@ -18798,5 +19357,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Číslo nástupiště" @@ -18804,10 +19363,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Označit jako plochu" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Vchod do metra" @@ -18816,10 +19375,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Upravit vchod do metra" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Invalidní vozík" @@ -18828,5 +19387,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Autobusové nádraží" @@ -18835,5 +19394,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Upravit autobusové nádraží" @@ -18841,5 +19400,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Zastávka autobusu" @@ -18849,5 +19408,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Upravit zastávku autobusu" @@ -18856,17 +19415,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Přístřešek" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Lavička" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Nástupiště autobusu" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Upravit nástupiště autobusu" @@ -18874,5 +19441,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Stanoviště taxi" @@ -18880,5 +19447,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Upravit stanoviště taxi" @@ -18886,5 +19453,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Letiště" @@ -18892,15 +19459,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Upravit letiště" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18908,10 +19475,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Cestování" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Ubytování" @@ -18923,5 +19490,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -18930,15 +19497,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Upravit hotel" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Počet hvězdiček" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motel" @@ -18946,20 +19513,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Upravit motel" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Penzion" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Upravit penzion" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Horská chata" @@ -18967,10 +19534,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Upravit horskou chatu" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Hostel" @@ -18978,30 +19545,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Upravit hostel" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Horská bouda" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Upravit vysokohorskou boudu" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Autokemping (karavany)" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Upravit autokemping (karavany)" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Tábořiště" @@ -19009,10 +19576,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Upravit tábořiště" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Jídlo a pití" @@ -19023,5 +19590,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurace" @@ -19029,5 +19596,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Upravit restauraci" @@ -19035,5 +19602,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Kuchyně" @@ -19041,61 +19608,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italská" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "čínská" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "řecká" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "německá" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indická" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "místní" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turecká" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asijská" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thajská" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexická" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japonská" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Rychlé občersvení" @@ -19103,9 +19670,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Upravit rychlé občerstvení" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Kavárna" @@ -19113,9 +19680,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Upravit kavárnu" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Hospoda" @@ -19123,18 +19690,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Upravit hospodu" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Hospoda-zahrádka" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Upravit hospoda-zahrádka" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Bar" @@ -19142,9 +19709,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Upravit bar" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Noční klub" @@ -19152,24 +19719,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Upravit noční klub" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turistika" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Atrakce" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Upravit atrakci" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Muzeum" @@ -19177,9 +19744,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Upravit muzeum" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -19188,9 +19755,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Upravit zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Vyhlídka" @@ -19198,24 +19765,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Upravit vyhlídku" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Vyhlídková věž" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Zábavní park" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Upravit zábavní park" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Umělecké dílo" @@ -19223,5 +19790,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Upravit umělecké dílo" @@ -19229,19 +19796,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Turistické informační centrum" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Přehledová mapa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "Úroveň detailů" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "topografická" @@ -19279,5 +19846,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19285,28 +19852,28 @@ msgstr "ulice" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "orientační" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "Zobrazený areál" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "místo" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "město" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "region" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Bližší popis" @@ -19316,5 +19883,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "Trasy zobrazeny pro:" @@ -19322,6 +19889,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Cyklistika" @@ -19329,5 +19896,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "Jízda na horském kole" @@ -19335,6 +19902,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Lyžování" @@ -19342,5 +19909,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "Jízda na koni" @@ -19348,46 +19915,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Informační nástěnka" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "Obsah tabule" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "upozornění" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "informace o historii" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "informace o přírodě" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "informace o divokých zvířatech" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "Rozcestník" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "Informační terminál" @@ -19395,29 +19962,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "Bližší popis" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1769 msgid "Audioguide" msgstr "Audioprůvodce" #. -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" msgstr "Audioprůvodce přes mobilní telefon?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 +#: build/trans_presets.java:1780 msgid "Phone number" msgstr "Telefonní číslo" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Jiný informační bod" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Upravit přístřešek" @@ -19425,25 +19992,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Ohniště" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Místo na piknik" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Upravit místo na piknik" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Historická místa" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Zámek/Hrad" @@ -19452,19 +20019,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Upravit zámek/hrad" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Zřícenina" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Upravit zříceninu" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Archeologické naleziště" @@ -19473,9 +20040,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Upravit archeologické naleziště" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Bojiště" @@ -19483,32 +20050,32 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Upravit bojiště" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" -msgstr "" +msgstr "Paleontologický areál" #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" -msgstr "" +msgstr "Upravit paleontologický areál" #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monument" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Upravit monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Památník" @@ -19516,55 +20083,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Upravit památník" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Kříž" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Upravit kříž" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Boží muka" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Upravit boží muka" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "Hraniční kameny" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "Upravit hraniční kameny" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Volný čas" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Akvapark" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Upravit akvapark" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Hřiště" @@ -19572,35 +20139,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Upravit hřiště" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Rybaření" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Upravit rybaření" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Sportovní potřeby" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Sportovní zařízení" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Upravit stadion" @@ -19614,6 +20181,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "vyberte sport:" @@ -20005,30 +20572,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "sport" @@ -20038,225 +20605,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "kombinovaný" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "lukostřelba" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "atletika" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "australský fotbal" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basketbal" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "Hry s koulemi (např. pétanque)" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "bowls" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "kanoistika" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "Horolezení" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "kriket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "ohražené místo pro tréning kriketu" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "kroket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "cyklistika" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "závody psů" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "krasojízda" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "fotbal" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gymnastika" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hokej" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "dostihy" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "motoristické sporty" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota (míčová hra)" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "pálkové (raketové) sporty" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "ragby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "střelba" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "bruslení" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "lyžování" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "fotbal" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "plavání" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "stolní tenis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tenis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Sportovní centrum" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Upravit sportovní centrum" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Hřiště" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Upravit hřiště" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Závodní trať" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Upravit závodní trať" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfové hřiště" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Upravit golfové hřiště" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Upravit minigolf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Kombinováné" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Upravit kombinované" @@ -20295,21 +20862,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "typ" @@ -20348,203 +20915,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "hřiště" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "sportovní centrum" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "Bowling" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Upravit bowling" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Atletika" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Upravit atletiku" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Lukostřelba" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Upravit lukostřelbu" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Horolezení" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Upravit horolezení" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Kanoistika" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Upravit kanoistiku" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Upravit cyklistiku" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Závody psů" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Upravit závody psů" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Krasojízda" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Upravit krasojízdu" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Dostihy" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Upravit dostihy" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gymnastika" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Upravit gymnastiku" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Motorové sporty" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Upravit motorové sporty" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Bruslení" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Upravit bruslení" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Upravit Skateboard" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Plavání" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Upravit plavání" @@ -20552,56 +21119,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Upravit lyžování" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Typ sjezdovky" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "Sjezdovka" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "Běžecká trať" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "snow park" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Obtížnost" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "pro začátečníky (zelená)" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "jednoduchá (modrá)" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "pro středně pokročilé (červená)" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "pro zkušené (černá)" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "pro experty (oranžová)" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "volný terén - freeride (žlutá)" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Střelba" @@ -20609,182 +21176,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Upravit střelbu" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Sport (míčové hry)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Fotbal" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Upravit fotbal" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Fotbal" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Upravit fotbal" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Australský fotbal" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Upravit australský fotbal" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Upravit baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basketbal" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Upravit basketbal" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Upravit Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golfové hřiště" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Hry s koulemi (např. pétanque)" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Upravit hry s koulemi (např. pétanque)" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Bowls" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Upravit Bowls" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Kriket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Upravit kriket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Ohražené místo pro tréning kriketu" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Upravit ohražené místo pro tréning kriketu" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Kroket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Upravit kroket" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hokej" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Upravit hokej" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota (míčová hra)" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Upravit pelotu (míčová hra)" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Pálkové (raketové) sporty" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Upravit pálkové (raketové) sporty" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Ragby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Upravit ragby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Stolní tenis (ping-pong)" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Upravit stolní tenis (ping-pong)" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Upravit tenis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Budovy" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Budova" @@ -20792,5 +21359,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Veřejná budova" @@ -20798,10 +21365,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Upravit veřejnou budovu" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Radnice" @@ -20809,10 +21376,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Upravit radnici" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Ambasáda" @@ -20820,10 +21387,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Upravit ambasádu" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Soud" @@ -20832,10 +21399,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Upravit soud" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Vězení" @@ -20844,10 +21411,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Upravit vězení" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Policie" @@ -20857,10 +21424,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Upravit policii" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Hasičská stanice" @@ -20869,10 +21436,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Upravit hasičskou stanici" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Pošta" @@ -20880,5 +21447,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Upravit poštu" @@ -20886,15 +21453,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Mateřská škola" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Upravit mateřskou školu" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Škola" @@ -20902,10 +21469,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Upravit školu" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Vysoká škola" @@ -20913,10 +21480,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Upravit vysokou školu" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Střední škola" @@ -20924,5 +21491,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Upravit střední školu" @@ -20930,5 +21497,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Kino" @@ -20937,10 +21504,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Upravit kino" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Knihovna" @@ -20949,9 +21516,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Upravit knihovnu" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Komunitní umělecké centrum" @@ -20959,10 +21526,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Upravit komunitní umělecké centrum" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Divadlo" @@ -20971,10 +21538,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Upravit divadlo" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Chrám(kostel, synagoga, mešita)" @@ -20984,5 +21551,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Upravit chrám" @@ -20991,6 +21558,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Náboženství" @@ -20999,66 +21566,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahá'í" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "budhistické" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "křesťanské" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hindské" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "džinistické" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "židovské" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "muslimské" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spiritualistické" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoistické" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "Unitářské" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastristické" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Vyznání" @@ -21067,81 +21634,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglikánské" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptistické" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "katolické" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangelické" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "svědkové Jehovovi" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "luteránské" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "metodistické" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormonské" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "pravoslavné" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pentekostalistické" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbyteriánské" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestantské" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "kvakerské" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "ší'itské" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunnitské" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adresy" @@ -21150,5 +21717,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Upravit informace o adrese" @@ -21156,5 +21723,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Číslo domu" @@ -21162,20 +21729,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Jméno domu" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Jméno ulice" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Jméno města" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Poštovní směrovací číslo" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Kód země" @@ -21184,5 +21756,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Upravit interpolaci adres" @@ -21190,61 +21762,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Schéma číslování" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "liché" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "sudé" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "abecední" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Umělé konstrukce" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Továrna" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Upravit továrnu" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Věž" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Upravit věž" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "Typ věže" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "telekomunikační" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "pozorovací" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "Výška (metrů)" @@ -21252,25 +21824,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Vodojem" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Upravit vodojem" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Plynojem" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Upravit plynojem" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Maják" @@ -21278,10 +21850,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Upravit maják" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Větrný mlýn" @@ -21289,10 +21861,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Upravit větrný mlýn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Potrubí" @@ -21301,37 +21873,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Upravit potrubí" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "ropa" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "plynová" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "kanalizace" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "teplo" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "podvodní" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "nadzemní" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Čistička odpadních vod" @@ -21341,10 +21913,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Upravit čističku odpadních vod" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Jeřáb" @@ -21352,10 +21924,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Upravit jeřáb" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Vodní bój" @@ -21363,10 +21935,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Editovat vodní bój" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Triangulační bod" @@ -21374,10 +21946,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Upravit triangulační bod" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Sledovací kamera" @@ -21385,5 +21957,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Upravit sledovací kameru" @@ -21391,5 +21963,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Elektrárna" @@ -21399,35 +21971,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Upravit elektrárnu" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "větrná" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "vodní" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fosilní paliva" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "jaderná" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "uhelná" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "sluneční" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Rozvodna" @@ -21436,10 +22008,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Upravit rozvodnu" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Trafostanice" @@ -21448,5 +22020,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Upravit trafostanici" @@ -21454,10 +22026,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Číslo vedení" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Stožár elektrického vedení" @@ -21468,23 +22040,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Upravit stožár elektrického vedení" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "věž" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "stožár" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Dráty elektrického vedení" @@ -21493,75 +22065,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Upravit dráty elektrického vedení" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "Typ vedení" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "vedení" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "vedlejší vedení" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Napětí" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "Počet kabelů" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "Počet drátů (nebo lépe vodičů) na každém kabelu" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "jednoduchý" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "dvojitý" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "trojitý" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "čtveřitý" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Občanská vybavenost" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Záchody" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Poznámka" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Poštovní schránka" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefon" @@ -21570,5 +22142,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Upravit telefon" @@ -21576,5 +22148,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Mince" @@ -21582,5 +22154,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Bankovky" @@ -21588,5 +22160,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Elektronické peněženky nebo kreditní karty." @@ -21594,5 +22166,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Debetní karty" @@ -21600,15 +22172,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kreditní karty" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefonní karty" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Recyklační stanoviště" @@ -21617,5 +22189,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Upravit recyklační stanoviště" @@ -21623,68 +22195,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Baterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Plechovky" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Oblečení" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Sklo" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papír" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Kovový šrot" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Lavička" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "Opěrka zad" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "Materiál" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "kámen" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "plast" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "Barva" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "černá" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "hnědá" @@ -21755,39 +22322,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "zeleň" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "červená" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "modrá" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "šedá" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "bílá" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "Počet sedadel" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Posed" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Upravit posed" @@ -21796,30 +22363,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Výška" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "nízká" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "střední" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "plná" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Úkryt" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Uzamknutelný" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fontána" @@ -21828,10 +22395,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Upravit fontánu" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Pitná voda" @@ -21840,10 +22407,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Upravit pitnou vodu" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Babybox" @@ -21851,33 +22418,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Upravit babybox" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Obchody" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Upravit obchod s auty" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Upravit prodejnu kol" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Upravit supermarket" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "Drogerie" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "Upravit drogerii" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Samoobsluha, smíšenka, večerka" @@ -21885,9 +22476,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Upravit večerku" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosek" @@ -21895,27 +22486,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Upravit kiosek" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "Knihkupectví" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "Upravit knihkupectví" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Cestovní kancelář" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Upravit cestovní kancelář" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Prodejní automat" @@ -21923,5 +22514,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Upravit prodejní automat" @@ -21929,88 +22520,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Prodávané produkty" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "lístky na městskou hromadnou dopravu" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "plány městské hromadné dopravy" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "parkovací lístky" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "jídlo" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "pití" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "sladkosti" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "cigarety" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "fotografie" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "krmivo pro zvířata" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "noviny" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "hračky" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "známky" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-karty" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "telefonní karty" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "poukazy" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "kondomy" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampóny" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "sáčky na výkaly" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Zůstatkové nebo věrnostní karty" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Řeznictví" @@ -22018,9 +22609,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Upravit řeznictví" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Pekařství" @@ -22028,9 +22619,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Upravit pekařství" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Květinářství" @@ -22038,18 +22629,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Upravit květinářství" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Obchod se zdravou výživou" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Upravit obchod se zdravou výživou" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Alkohol" @@ -22057,54 +22648,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Upravit obchod s alkoholem" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Nápoje" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Upravit obchod s nápoji" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Počítače" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Upravit obchod s počítači" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Elektronika" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Upravit obchod s elektronikou" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Upravit obchod s hifi" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Nábytek" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Upravit obchod s nábytkem" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Zahradnické centrum" @@ -22112,9 +22703,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Upravit zahradnické centrum" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Železářství" @@ -22122,9 +22713,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Upravit železářství" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Zboží pro kutily" @@ -22132,54 +22723,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Upravit obchod se zbožím pro kutily" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Papírnictví" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Upravit papírnictví" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Kadeřnictví" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Upravit Kadeřnictví" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Obuv" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Upravit obchod s obuví" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Hračky" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Upravit obchod s hračkami" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Videopůjčovna/prodejna" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Upravit videopůjčovnu/prodejnu" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Čistírna" @@ -22187,9 +22778,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Upravit čistírnu" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Prádelna" @@ -22197,9 +22788,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Upravit prádelnu" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Vybavení do přírody" @@ -22207,28 +22798,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Obchod s vybavením do přírody" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Upravit obchod se sportovními pořebami" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Oční optik" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Upravit oční optiku" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Finance" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banka" @@ -22236,14 +22827,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Upravit banku" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Směnárna" @@ -22251,5 +22842,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Upravit směnárnu" @@ -22257,15 +22848,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Upravit bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Zdraví" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Středisko" @@ -22273,18 +22864,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Upravit středisko" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Zubař" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Upravit zubařskou ordinaci" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Lékárna" @@ -22292,5 +22883,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Upravit lékárnu" @@ -22298,9 +22889,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Vydává léky na předpis" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Nemocnice" @@ -22308,10 +22899,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Upravit nemocnici" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Místo pro kontaktování záchranářů" @@ -22320,5 +22911,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Upravit místo pro kontaktování záchranářů" @@ -22327,20 +22918,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Číslo místa" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Jméno místa" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Telefonní číslo" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Použijte mezinárodní zápis, např. +420123456789)" @@ -22348,5 +22939,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Veterinář" @@ -22355,64 +22946,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Upravit veterinární ordinaci" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Místa" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Upravit kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Stát" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Upravit stát" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Země" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Upravit zemi" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Kraj" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Upravit kraj" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Okres" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Upravit okres" @@ -22420,15 +23011,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Velkoměsto" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Upravit velkoměsto" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Město" @@ -22436,10 +23027,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Upravit město" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Městský obvod, nebo městská část" @@ -22447,25 +23038,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Upravit městský obvod, nebo městská část" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Obec" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Upravit obci" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Samota" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Upravit samotu" @@ -22473,5 +23064,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Místní název" @@ -22479,10 +23070,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Editovat místní název" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Ostrov" @@ -22490,10 +23081,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Upravit ostrov" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "Ostrůvek" @@ -22501,5 +23092,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "Upravit ostrůvek" @@ -22507,5 +23098,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Vstup do jeskyně" @@ -22513,10 +23104,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Upravit vstup do jeskyně" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Vrchol" @@ -22524,10 +23115,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Upravit vrchol" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Ledovec" @@ -22535,10 +23126,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Upravit ledovec" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Sopka" @@ -22546,70 +23137,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Upravit sopku" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Hranice" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Národní" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Upravit národní hranici" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administrativní" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Upravit administrativní hranici" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Volební obvod" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Upravit volební obvod" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Národní park" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Upravit hranice národního parku" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Využití krajiny" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Strom" @@ -22618,15 +23209,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Upravit strom" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botanické jméno" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Prales" @@ -22635,5 +23226,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Editovat Prales" @@ -22641,17 +23232,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "jehličnatý" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "listnatý" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "smíšený" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Les" @@ -22660,14 +23251,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Upravit lesní plochu" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Přírodní rezervace" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Upravit přírodní rezervaci" @@ -22675,25 +23266,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Suťoviště" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Upravit suťoviště" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Podrost" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Upravit podrost" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Travnatá pahorkatina" @@ -22701,10 +23292,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Upravit travnatou pahorkatinu" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Vřesoviště" @@ -22712,5 +23303,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Upravit vřesoviště" @@ -22718,5 +23309,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Farma" @@ -22725,45 +23316,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Upravit farmu" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Zemědělská půda" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Upravit zemědělskou půdu" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Louka" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Upravit louku" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vinice" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Upravit vinici" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Zahrádkářská kolonie" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Upravit zahrádkářskou kolonii" @@ -22771,25 +23362,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Zahrada" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Upravit zahradu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Tráva" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Upravit travnatou plochu" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Zelená plocha" @@ -22797,10 +23388,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Upravit zelenou plochu" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "veřejná zeleň (mimo parky)" @@ -22808,20 +23399,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Upravit veřejnou zeleň" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Upravit park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Rekreační plocha" @@ -22829,5 +23420,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Upravit rekreační plochu" @@ -22835,15 +23426,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Obytná plocha" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Upravit obytnou plochu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Malý hřbitov" @@ -22851,9 +23442,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Upravit malý hřbitov" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Hřbitov" @@ -22861,39 +23452,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Upravit hřbitov" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Obchody" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Upravit plochu s obchody" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Kanceláře" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Upravit kancelářskou plochu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Průmysl" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Upravit průmyslovou plochu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Železniční plocha" @@ -22901,15 +23492,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Upravit železniční plochu" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Vojenský prostor" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Upravit vojenský prostor" @@ -22917,55 +23508,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Probíhající výstavba" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Upravit výstavbu" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Stará zátěž, městské ruiny (Brownfield)" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Upravit starou zátěž (Brownfield)" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Zastavitelné území (Greenfield)" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Upravit zastavitelné území (Greenfield)" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "skládka odpadu" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Upravit skládku odpadu" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Lom" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Upravit lom" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multipolygon" @@ -22975,5 +23566,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Upravit multipolygon" @@ -22982,10 +23573,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "vnější část" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "vnitřní část" @@ -22993,5 +23584,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Zákaz odbočení" @@ -23000,5 +23591,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Upravit zákaz odbočení" @@ -23006,34 +23597,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Omezení" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "zákaz odbočení vlevo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "zákaz odbočení vpravo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "zákaz jízdy rovně" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "zákaz otáčení" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "pouze odbočení vpravo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "pouze odbočení vlevo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "pouze jízda rovně" @@ -23042,15 +23633,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "z cesty" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "přes uzel nebo cestu" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "na cestu" @@ -23058,5 +23649,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Trasa" @@ -23065,5 +23656,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Upravit trasu" @@ -23071,5 +23662,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Typ trasy" @@ -23141,24 +23732,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "bicykl" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "silnice" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "trajekt" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "lyžařská" @@ -23211,5 +23802,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23218,13 +23809,13 @@ msgstr "pěší" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "turistická" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "tramvajová" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "objízdná" @@ -23238,10 +23829,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Popis symbolu" @@ -23249,31 +23840,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Síť" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "navrhovaná" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "alternativní" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "dočasná" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "spojení" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Barva (hex)" @@ -23282,30 +23873,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "segment trasy" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "dopředný segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "zpětný segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "zastávka" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "dopředná zastávka" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "zpětná zastávka" @@ -23516,130 +24107,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23656,98 +24121,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "zastaralý" @@ -24124,7 +24498,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "dálnice" @@ -24188,13 +24562,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "železnice" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24210,5 +24663,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "služby" @@ -24222,5 +24675,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "brod" @@ -24241,5 +24694,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "" @@ -24254,5 +24707,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -24267,5 +24720,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "říční břeh" @@ -24279,5 +24732,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "potok" @@ -24291,5 +24744,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "dok" @@ -24311,16 +24764,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "akvadukt" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24417,4 +24858,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24483,13 +24931,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24535,6 +24983,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24551,7 +24999,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24574,10 +25022,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24613,11 +25061,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24658,6 +25107,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24671,5 +25120,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminál" @@ -24691,5 +25140,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24703,5 +25152,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24709,4 +25158,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24756,7 +25212,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "lanovka" @@ -24773,5 +25229,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "lehká sjezdovka" @@ -24786,5 +25242,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "střední sjezdovka" @@ -24799,5 +25255,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "těžká sjezdovka" @@ -24812,5 +25268,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "sjezdovka pro experty" @@ -24825,5 +25281,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24838,5 +25294,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "sjezdovka pro začátečníky" @@ -24956,11 +25412,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "energetika" @@ -24974,5 +25430,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "molo" @@ -24986,5 +25442,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "potrubí" @@ -25112,12 +25568,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "oddych (leisure)" @@ -25131,5 +25604,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "přísav" @@ -25167,4 +25640,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25183,4 +25672,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25201,8 +25698,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "občanská vybavenost" @@ -25304,10 +25803,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25561,5 +26060,5 @@ #. #. -#. +#. #. color health #. @@ -25705,4 +26204,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25722,23 +26229,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25770,6 +26277,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "menší vodní plochy" @@ -25830,14 +26337,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "zdravotnictví" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26184,5 +26691,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26205,5 +26711,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "obchod" @@ -26275,8 +26782,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotel" @@ -26377,9 +26884,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turistika" @@ -26467,9 +26974,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "historické" @@ -26483,5 +26990,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "lom" @@ -26495,5 +27002,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "skládka" @@ -26515,5 +27022,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "nádrže" @@ -26527,5 +27034,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "les" @@ -26539,5 +27046,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "zemědělství" @@ -26560,5 +27067,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "obchody" @@ -26572,5 +27079,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "průmysl" @@ -26584,5 +27091,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "stará zátěž, městské ruiny (Brownfield)" @@ -26596,5 +27103,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "Zastavitelné území (Greenfield)" @@ -26608,5 +27115,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "železniční plochy" @@ -26663,7 +27170,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "vojenský" @@ -26677,5 +27184,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "hřbitov" @@ -26688,5 +27195,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "vrchol" @@ -26701,5 +27208,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "ledovec" @@ -26713,5 +27220,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "sopka" @@ -26766,8 +27273,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "přírodní" @@ -26781,5 +27288,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "křoví" @@ -26793,5 +27300,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "vřesoviště" @@ -26805,5 +27312,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "zalesněné území" @@ -26817,5 +27324,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "bahno" @@ -26829,5 +27336,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "pláž" @@ -26905,8 +27412,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "cesta" @@ -26954,7 +27461,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "hranice" @@ -27104,11 +27611,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "místo" @@ -27156,6 +27663,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adresa" @@ -27473,5 +27980,5 @@ #: build/trans_wms.java:35 msgid "7th Series (OS7)" -msgstr "" +msgstr "7th Series (OS7)" #. http://ooc.openstreetmap.org/wms/map.php?source=os7& @@ -27481,20 +27988,20 @@ #: build/trans_wms.java:39 msgid "MLIT Japan (ORTHO)" -msgstr "" +msgstr "MLIT Japan (ORTHO)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF #: build/trans_wms.java:40 msgid "MLIT Japan (ORTHO01)" -msgstr "" +msgstr "MLIT Japan (ORTHO01)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF #: build/trans_wms.java:41 msgid "MLIT Japan (ORTHO02)" -msgstr "" +msgstr "MLIT Japan (ORTHO02)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF #: build/trans_wms.java:42 msgid "MLIT Japan (ORTHO03)" -msgstr "" +msgstr "MLIT Japan (ORTHO03)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF @@ -27504,183 +28011,234 @@ #: build/trans_wms.java:46 msgid "Lodi - Italy" -msgstr "" +msgstr "Lodi - Itálie" #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& #: build/trans_wms.java:47 msgid "Sicily - Italy" -msgstr "" +msgstr "Sicily - Itálie" + +#~ msgid "Updating primitive" +#~ msgstr "Aktualizuji prvky" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Očekávám uzavírací závorku." #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná" +#~ "Počet změn překračuje maximální počet změn. Počet změn je {0} a maximum " +#~ "je {1}" + +#~ msgid "Use an open changeset" +#~ msgstr "Použít otevřenou sadu změn" #~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" -#~ msgstr "" -#~ "Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého " -#~ "prvku samostatně" +#~ "I can take a picture of my GPS receiver.
Can this help?" +#~ msgstr "Mohu vyfotit můj GPS přijímač.
Může to pomoci?" + +#~ msgid "All images" +#~ msgstr "Všechny obrázky" + +#~ msgid "Images with no exif position" +#~ msgstr "Obrázky bez exif pozice" + +#~ msgid "Not yet tagged images" +#~ msgstr "Neotagované obrázky" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Nalezeno {0} shod s {1} v GPX trase {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "Nahrána GPX trasa" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Posun mezi trasou a fotografiemi: {0}m {1}s" + +#~ msgid "Default Values" +#~ msgstr "Výchozí hodnoty" + +#~ msgid "Enable proxy server" +#~ msgstr "Používat proxy server" + +#~ msgid "Anonymous" +#~ msgstr "Anonymní" + +#~ msgid "Proxy server host" +#~ msgstr "Adresa proxy serveru" + +#~ msgid "Proxy server port" +#~ msgstr "Port proxy serveru" + +#~ msgid "Proxy server username" +#~ msgstr "Uživatelské jméno pro proxy" + +#~ msgid "Proxy server password" +#~ msgstr "Heslo pro proxy" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, pravděpodobně chybí některé tagy." + +#~ msgid "Preparing data..." +#~ msgstr "Připravuji data..." + +#~ msgid "Preparing..." +#~ msgstr "Připravuji..." + +#~ msgid "Uploading..." +#~ msgstr "Nahrávám..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Nesprávné heslo nebo uživatelské jméno" + +#~ msgid "Enter Password" +#~ msgstr "Zadejte heslo" + +#~ msgid "Login" +#~ msgstr "Přihlásit se" + +#~ msgid "Error: failed to add authentication credentials to the connection." +#~ msgstr "Chyba: nepodařilo se přidat přihlašovací udaje do připojení." + +#~ msgid "Interpolation" +#~ msgstr "Interpolace" + +#~ msgid "Optional" +#~ msgstr "Volitelné" + +#~ msgid "Shop" +#~ msgstr "Obchod" + +#~ msgid "aqueduct" +#~ msgstr "akvadukt" + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "No data imported." +#~ msgstr "Nic nebylo importováno" + +#~ msgid "Data Layer" +#~ msgstr "Vrstva dat" + +#~ msgid "Please select at least one task to download" +#~ msgstr "Prosím zvol aspoň jeden úkol ke stažení" + +#~ msgid "JOSM Online Help" +#~ msgstr "JOSM Online Nápověda" + +#~ msgid "Open in Browser" +#~ msgstr "Otevřít v prohlížeči" + +#~ msgid "unnamed" +#~ msgstr "nepojmenováno" + +#~ msgid "Unknown file extension." +#~ msgstr "Neznámá přípona souboru." + +#~ msgid "Change" +#~ msgstr "Změnit" + +#~ msgid "Rotate" +#~ msgstr "Otočit" + +#~ msgid "Move" +#~ msgstr "Přesunout" + +#~ msgid "false" +#~ msgstr "nepravda" + +#~ msgid "true" +#~ msgstr "pravda" + +#~ msgid "different" +#~ msgstr "různé" + +#~ msgid "position" +#~ msgstr "pozice" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "their version:" +#~ msgstr "verze na serveru:" + +#~ msgid "resolved version:" +#~ msgstr "finální verze:" + +#~ msgid "my version:" +#~ msgstr "moje verze:" + +#~ msgid "Date" +#~ msgstr "Datum" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Revert" +#~ msgstr "Vrátit zpět" + +#~ msgid "Unsaved Changes" +#~ msgstr "Neuložené změny" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" + +#~ msgid "Read GPX..." +#~ msgstr "Číst GPX..." + +#~ msgid "GPS start: {0}" +#~ msgstr "Start GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "nynější odchylka: {0}s" + +#~ msgid "GPS end: {0}" +#~ msgstr "Konec GPS: {0}" + +#~ msgid "timezone difference: " +#~ msgstr "rozdíl časových pásem: " + +#~ msgid "Sync clock" +#~ msgstr "Synchronizovat hodiny" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Data v souboru \"{0}\" nemohla být parsována." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "V souboru \"{0}\" není časová značka EXIF" + +#~ msgid "Image" +#~ msgstr "Obrázek" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)" + +#~ msgid "Error while loading page {0}" +#~ msgstr "Chyba při načítání stránky {0}" + +#~ msgid "Cannot connect to server." +#~ msgstr "Nemohu se připojit na server." + +#~ msgid "There were conflicts during import." +#~ msgstr "Vznikly konflikty během importu" + +#~ msgid "Select a bookmark first." +#~ msgstr "Nejdříve zvolte záložku" + +#~ msgid "Error parsing server response." +#~ msgstr "Chyba parsování odezvy serveru" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Žádný čas pro bod {0} x {1}" #~ msgid "Images for {0}" #~ msgstr "Obrázky pro {0}" -#~ msgid "Read GPX..." -#~ msgstr "Číst GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Žádný čas pro bod {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou." - -#~ msgid "GPS start: {0}" -#~ msgstr "Start GPS: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "Konec GPS: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "nynější odchylka: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "rozdíl časových pásem: " - -#~ msgid "Sync clock" -#~ msgstr "Synchronizovat hodiny" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Data v souboru \"{0}\" nemohla být parsována." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "V souboru \"{0}\" není časová značka EXIF" - -#~ msgid "Image" -#~ msgstr "Obrázek" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Synchronizace času s GPS přijímačem" - #~ msgid "Time entered could not be parsed." #~ msgstr "Zadaný čas nemůže být rozparsován" - -#~ msgid "" -#~ "Loading of {0} plugin was requested. This plugin is no longer required." -#~ msgstr "Požadováno nahrání pluginu {0}. Tento plugin není již nadále třeba." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - obrázky s geoznačkami" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Otevřít obrázky s AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "nastavení osmarenderu" - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Několik nástrojů pro jednodužší život: např. zjednodušení cest, spojení " -#~ "ploch, skok na pozici." - -#~ msgid "File could not be found." -#~ msgstr "Soubor nebyl nalezen" - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "No data imported." -#~ msgstr "Nic nebylo importováno" - -#~ msgid "Data Layer" -#~ msgstr "Vrstva dat" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Prosím zvol aspoň jeden úkol ke stažení" - -#~ msgid "JOSM Online Help" -#~ msgstr "JOSM Online Nápověda" - -#~ msgid "Open in Browser" -#~ msgstr "Otevřít v prohlížeči" - -#~ msgid "unnamed" -#~ msgstr "nepojmenováno" - -#~ msgid "Unknown file extension." -#~ msgstr "Neznámá přípona souboru." - -#~ msgid "Change" -#~ msgstr "Změnit" - -#~ msgid "Rotate" -#~ msgstr "Otočit" - -#~ msgid "Move" -#~ msgstr "Přesunout" - -#~ msgid "false" -#~ msgstr "nepravda" - -#~ msgid "true" -#~ msgstr "pravda" - -#~ msgid "different" -#~ msgstr "různé" - -#~ msgid "position" -#~ msgstr "pozice" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "their version:" -#~ msgstr "verze na serveru:" - -#~ msgid "resolved version:" -#~ msgstr "finální verze:" - -#~ msgid "my version:" -#~ msgstr "moje verze:" - -#~ msgid "Date" -#~ msgstr "Datum" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "Revert" -#~ msgstr "Vrátit zpět" - -#~ msgid "Unsaved Changes" -#~ msgstr "Neuložené změny" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" - -#~ msgid "Error while loading page {0}" -#~ msgstr "Chyba při načítání stránky {0}" - -#~ msgid "Cannot connect to server." -#~ msgstr "Nemohu se připojit na server." - -#~ msgid "There were conflicts during import." -#~ msgstr "Vznikly konflikty během importu" - -#~ msgid "Select a bookmark first." -#~ msgstr "Nejdříve zvolte záložku" - -#~ msgid "Error parsing server response." -#~ msgstr "Chyba parsování odezvy serveru" #~ msgid "name" @@ -27925,4 +28483,7 @@ #~ msgstr "Autoři: {0}" +#~ msgid "osmarender options" +#~ msgstr "nastavení osmarenderu" + #~ msgid "Import TCX file as GPS track" #~ msgstr "Importovat TCX soubor jako GPS trasu" @@ -27960,4 +28521,7 @@ #~ msgid "Refresh the selection list." #~ msgstr "Obnovit výběr" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchronizace času s GPS přijímačem" #~ msgid "Empty member in relation." @@ -27995,4 +28559,7 @@ #~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před " #~ "nahráním na server." + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)" #~ msgid "Open a layer first (GPX, OSM, cache)" @@ -28161,4 +28728,7 @@ #~ msgstr "Editovat turistické informační centrum" +#~ msgid "No images with readable timestamps found." +#~ msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou." + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -28183,4 +28753,11 @@ #~ "Nástroje pro správu autorů/uživatelů. Vybere mapová data, která patří " #~ "určitmu uživateli, otevře prohlížeč se stránkou vybraného autora." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Několik nástrojů pro jednodužší život: např. zjednodušení cest, spojení " +#~ "ploch, skok na pozici." #~ msgid "Directly load TCX files from JOSM." @@ -28212,4 +28789,7 @@ #~ "\n" #~ "{0}" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Otevřít obrázky s AgPifoJ..." #~ msgid "" @@ -28396,4 +28976,11 @@ #~ msgstr "Neznámá přípona souboru ''{0}''" +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého " +#~ "prvku samostatně" + #~ msgid "Can't search because there is no loaded data." #~ msgstr "Nelze hledat jelikož nejsou nahrána žádná data." @@ -28415,4 +29002,7 @@ #~ msgid "Linked" #~ msgstr "Spojený" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - obrázky s geoznačkami" #~ msgid "Replaces Selection with Users data" @@ -28479,7 +29069,4 @@ #~ msgstr "Vyberte počáteční bod na konci cesty" -#~ msgid "Reached a junction" -#~ msgstr "Dosažena křižovatka" - #~ msgid "Help page missing. Create it in English." #~ msgstr "Chybí stránka nápovědy. Vytvořte ji v češtině." @@ -28492,4 +29079,9 @@ #~ "anebo ve vašem jazyce." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná" + #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "V této datové sadě nelze nalézt prvek s id {0}" @@ -28541,2 +29133,6 @@ #~ msgid "Help / About" #~ msgstr "Nápověda / O programu" + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "Požadováno nahrání pluginu {0}. Tento plugin není již nadále třeba." Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 19198) +++ /applications/editors/josm/i18n/po/da.po (revision 19199) @@ -4,11 +4,12 @@ # FIRST AUTHOR , 2008. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-29 22:13+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-07 09:50+0000\n" +"Last-Translator: Peter Brodersen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Skaber hovedgrænsefladen" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hjælp" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorerer defekt URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorerer defekt fil-URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Kunne ikke læse filen \"{0}\".
Fejlen er:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Kunne ikke læse filen \"{0}\".
Fejlen er:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "Om JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -277,5 +279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -284,5 +286,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -291,15 +293,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Fortsæt" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -308,29 +315,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -347,5 +355,9 @@ msgstr "Fortryd" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Vælg venligst et allerede uploadet punkt, vej eller relation." @@ -361,5 +373,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Sammenflet" @@ -379,15 +391,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Tilføj punkt..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Tilføj punkt ved at indtaste bredde og længde." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -403,22 +415,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Ret: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Indtast koordinater for nyt punkt." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Brug decimaltal i grader." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative værdier angiver vestlig/sydlig halvkugle." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -427,5 +439,5 @@ msgstr "Breddegrad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -434,28 +446,29 @@ msgstr "Længdegrad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -467,9 +480,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -490,18 +503,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -513,5 +526,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -533,6 +546,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -579,5 +592,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" @@ -614,14 +627,15 @@ msgstr "Ingen konflikter at zoome ind på." -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Luk åbne rettesæt" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Lukker åbne rettesæt" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -631,21 +645,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Fil: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Der er ingen åbne rettesæt" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Ingen åbne rettesæt" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Henter åbne rettesæt ..." @@ -732,11 +746,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -788,5 +803,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 msgid "Download parent ways/relations..." -msgstr "" +msgstr "Hent forældres veje/relationer" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40 @@ -814,16 +829,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -859,5 +879,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplikér" @@ -887,23 +907,23 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Vis i fuldskærm" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Skift mellem fuldskærmsvisning" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 msgid "Toggle Fullscreen view" -msgstr "" +msgstr "Skift mellem fuldskærmsvisning" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Eksporter til GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Eksporter dataet til GPS-fil." @@ -918,12 +938,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -948,8 +968,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -960,10 +980,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -976,17 +996,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1023,22 +1043,27 @@ msgstr "Vis objekt-informationer om punkter, veje eller relationer i OSM." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Foren overlappende områder" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Vælg mindst en lukket vej, som skal forbindes." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Kun op til to områder kan sammensættes i øjeblikket" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" er ikke lukket og kan derfor ikke blive forbundet." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1048,38 +1073,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Fortryd venligst, hvis du ikke er sikker" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Vælg mindst en lukket vej, som skal forbindes." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Tilføjede punkter ved alle kryds" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Slet veje, som ikke er en del af en indre multipolygon" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Ret relationer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Sammenlagde selv-overlappende område" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Sammensatte overlappende områder" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1087,33 +1108,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Indtast værdier for alle konflikter." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Fjernede element fra relationer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Sammenlæg områder: Fjern korte veje" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Lukket vej" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Fjern tags fra indre veje" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Funktion til sammenlægning af områder" @@ -1276,5 +1297,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kan ikke flytte objekter ud af verden." @@ -1352,30 +1373,30 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109 msgid "Download Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +msgstr "Download data" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Gør vinkler rette" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Flyt punkter så alle vinkler er 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1384,9 +1405,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1395,16 +1416,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 -msgid "Usage" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 -msgid "Selected Elements cannot be orthogonalized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 msgid "Orthogonalize" msgstr "Gør vinkler rette" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 +msgid "Usage" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 +msgid "Selected Elements cannot be orthogonalized" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1477,18 +1498,18 @@ msgstr "Kunne ikke omdøbe filen \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Vend veje om" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Vend retningen for alle valgte veje." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Vælg mindst én vej." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Vend veje om" @@ -1497,10 +1518,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Gem" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Gem nuværende data." @@ -1557,10 +1578,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Gem som..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Gem det nuværende data i en ny fil." @@ -1603,6 +1624,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1634,5 +1654,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1695,5 +1715,5 @@ "vejen.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1701,5 +1721,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1707,5 +1727,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1739,33 +1759,33 @@ msgstr "Dette punkt er ikke forbundet til noget andet." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Ingen af disse punkter er fastklistret til noget andet." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Ingen af denne vejs punkter er forbundet til noget andet." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Vælg enten:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Et markeret punkt, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Et punkt, som bruges af mere end én vej, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* Et punkt, som bruges af mere end én vej en af disse veje, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1774,5 +1794,5 @@ "eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1781,5 +1801,5 @@ "vej." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1789,9 +1809,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1799,5 +1819,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1832,64 +1852,60 @@ msgstr "Fravælg alt (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgstr "Opdater data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." -msgstr "" +msgstr "Opdaterer objekter i det aktive datalag fra serveren" #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +msgstr "Download data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Opdater det valgte" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +msgstr "Opdaterer de valgte objekter fra serveren (gen-henter data)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Opdater det valgte" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "Der er ingen valgte objekter at opdatere" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Intet er valgt" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1898,5 +1914,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1904,131 +1920,7 @@ msgstr "Ingen ændringer at sende." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Intet at sende. Skab først noget data." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synkronisér hele datasættet" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Opdaterer primitiv" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2163,9 +2055,9 @@ msgstr "Hent GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Henter data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2173,5 +2065,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2222,5 +2114,5 @@ #, java-format msgid "The following errors occurred during mass download: {0}" -msgstr "" +msgstr "Følgende fejl opstod under masse-download: {0}" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 @@ -2231,5 +2123,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" -msgstr "" +msgstr "Fejl ved download" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93 @@ -2242,7 +2134,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2259,58 +2151,52 @@ "når en vej slettes. Ctrl: Slet refererende objekter." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Tegn" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Tegn punkter" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Tilstand: Tegn fokus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "valgt" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Kan ikke tilføje et punkt uden for verdenen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Tilføj punkt" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Tilføj punkt inde i vej" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Forbind eksisterende vej til punkt" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Tilføj et nyt punkt til en eksisterende vej" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Tilføj punkt ind i vej og forbind" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Opret nyt punkt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Vælg punkt under markøren." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2319,14 +2205,14 @@ msgstr[1] "Indsæt nyt punkt i {0} veje." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Start ny vej fra seneste punkt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Fortsæt vej fra seneste punkt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Afslut tegning." @@ -2365,18 +2251,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Markering" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Vælg, flyt og rotér objekter" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2385,17 +2272,17 @@ msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Flyt elementer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Flyt dem" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Fortryd flytning" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2405,13 +2292,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Slip museknappen for at vælge objekterne inden i firkanten." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2420,9 +2307,9 @@ "nærmeste punkt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Slip museknappen for at stoppe rotationen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2435,5 +2322,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Forstør" @@ -2455,5 +2342,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Søg efter objekter." @@ -2541,7 +2428,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - alle objekter rettet af bruger" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2550,8 +2436,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2559,46 +2453,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - alle ændrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - alle valgte objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - alle ufuldstændige objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" "Brug | eller OR to for at forbinde med et logisk \"eller\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Brug \" for at angive operatorer (fx hvis key indeholder : )" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Brug ( og ) for at gruppere udtryk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2606,55 +2506,55 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Søg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Start søgning" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Intet resultat for \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Intet tilføjet til det valgte ved søgning efter \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Intet fjernet fra det valgte ved søgning efter \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Fandt {0} resultater" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "Versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "Ikke-versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "Regulært udtryk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2668,40 +2568,43 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Mangler argumenter for \"eller\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Mangler argument fro \"ikke\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Forventede slutparentes." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Mangler argumenter for \"eller\"." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2710,9 +2613,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2721,7 +2624,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2755,40 +2663,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Det nuværende antal ændringer overskrider det maksimale antal; nuværende er " -"{0}, maksimum er {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Brud på forudgående krav" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" +"{0} punkter i vej {1} overskrider det maksimalt tilladte antal punkter {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Brud på API-egenskaber" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Brud på forudgående krav" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"{0} punkter i vej {1} overskrider det maksimalt tilladte antal punkter {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2900,5 +2798,5 @@ msgstr "Sæt {0}={1} for {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2913,5 +2811,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -3012,4 +2910,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3121,5 +3034,5 @@ msgstr "Udfør?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3203,15 +3116,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "Fejl i konfigurationsfilen ved linjerne {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3220,5 +3133,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3227,5 +3140,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3234,5 +3147,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3241,5 +3154,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3247,5 +3160,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3254,5 +3167,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3261,5 +3174,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3268,5 +3181,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3275,10 +3188,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3286,24 +3199,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Indstillinger er gemt på {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Kunne ikke sende indstillinger. Årsag: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Kunne ikke hente indstillinger fra serveren." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3312,5 +3225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3339,5 +3252,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3359,31 +3272,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "V" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "Ø" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3391,5 +3297,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3400,27 +3306,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3428,5 +3334,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3438,5 +3344,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3444,25 +3350,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3470,43 +3376,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3514,5 +3432,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3540,10 +3458,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3551,7 +3465,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3566,5 +3480,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3582,146 +3496,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "En vej af typen Område er ikke lukket." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "multipolygon-vej \"{0}\" er ikke lukket." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Slettede medlem \"{0}\" i relation" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Vej \"{0}\" med mindre end to punkter." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Mere end én \"fra\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Mere end én \"til\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Mere end én \"via\" blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Ukendt rolle \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Ukendt medlemstype for \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Ingen \"fra\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Ingen \"til\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Intet \"via\"-punkt eller vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Indre vej \"{0}\" er på ydersiden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Ikke-vej \"{0}\" i multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Ingen ydre vej for multipolygon \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "utagget" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "tekst" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Fejl: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Advarsel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "inaktiv" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "valgt" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3730,6 +3636,6 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3738,7 +3644,8 @@ msgstr[1] "veje" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3747,21 +3654,37 @@ msgstr[1] "relationer" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "utagget vej" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "ukomplet vej" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "baggrund" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "fremhæv" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "utagget" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "tekst" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3903,5 +3826,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "jernbane" @@ -3917,7 +3840,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3933,4 +3856,10 @@ msgstr[1] "{0} medlemmer" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3962,6 +3891,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Konflikt" @@ -3975,7 +3904,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4061,74 +3990,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Brugernavn" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Kodeord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "brug" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "valgmuligheder" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Vis denne hjælp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Hent det omsluttende område" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Hent lokaliteten fra URL'en (med lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Åbn fil (som rå GPS, hvis .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Hent det omsluttende område som rå gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Start op i maksimeret tilstand" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Nulstil indstillingerne til standard" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Vælg sprog." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4137,9 +4066,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "eksempler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4147,36 +4076,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "I stedet for --download= kan du angive osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktiverer opdaterede udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Henter indledende udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Sætter standardværdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Henter udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Filer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4191,22 +4120,22 @@ msgstr "Rediger" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Funktioner" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Forudindstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4214,5 +4143,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Lyd" @@ -4291,13 +4220,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "lag er ikke i listen" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4331,5 +4261,5 @@ msgstr "Initialiserer" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4337,6 +4267,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4345,5 +4275,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4352,5 +4282,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4359,25 +4289,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4385,9 +4315,9 @@ msgstr "Rolle" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4419,11 +4349,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4432,6 +4362,6 @@ msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4439,6 +4369,6 @@ msgstr "Punkter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4446,40 +4376,40 @@ msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags ({0} konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Punkter (afklaret)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Punkter (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Medlemmer (afklaret)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4487,21 +4417,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Medlemmer (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Egenskaber (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4533,22 +4463,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Sammenlign " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Min version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4556,5 +4486,5 @@ msgstr "Sammenflettet version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4562,30 +4492,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Deres version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> top" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> bund" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4593,5 +4523,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4599,14 +4529,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4614,5 +4544,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4620,23 +4550,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Op" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Flyt de valgte elementer ét trin op" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Ned" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Flyt de valgte elementer ét trin ned" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4647,27 +4577,27 @@ msgstr "Fjern" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4676,5 +4606,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4683,5 +4613,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4690,5 +4620,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4697,5 +4627,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4704,5 +4634,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4712,5 +4642,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4947,10 +4877,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4960,10 +4890,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5048,9 +4978,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5058,6 +4988,6 @@ msgstr "intet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "alle" @@ -5146,7 +5076,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5156,6 +5086,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5263,4 +5193,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Slet valgte objekter." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Ret værdier?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Hent" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Hent kort-data fra OSM serveren." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Lukker åbne rettesæt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Åbn en editor for den valgte relation" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5274,12 +5256,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5297,13 +5279,13 @@ msgstr "Kommando-stak: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Løs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5311,6 +5293,6 @@ "liste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5318,25 +5300,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5348,26 +5330,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5378,41 +5360,41 @@ msgstr "Tilføj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5451,5 +5433,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5464,34 +5446,34 @@ msgstr "Åbn en liste af alle hentede lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Slet det valgte lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Vis/skjul" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Skift synligheden for det valgte lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Flyt det valgte lag en række op." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Flyt det valgte lag en række ned." @@ -5501,5 +5483,175 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Åbn en liste over alle relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relationer: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Åbn en editor for den valgte relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Slet de nvalgte relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Opret en ny relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Aktuelt valg" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Åbn et vindue med en liste til udvælgelse." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Zoom til valgt(e) element(er)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Zoom til det valgte" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Valgt: Rel.:{0} / Veje:{1} / Punkter:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Markering" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Valgt: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Frigør panelet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Klik for at minimere/maksimere panelet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Forfattere" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Åbn en liste af brugere, der arbejder på de valgte objekter." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Forfatter" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# objekter" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "ufuldstændig" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "Luk" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Henter åbne rettesæt ..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5508,22 +5660,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Ret værdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5532,5 +5684,5 @@ msgstr[1] "Ret egenskaber for op til {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5539,226 +5691,71 @@ msgstr[1] "Dette vil ændre på op til {0} objekter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Vælg venligst en nøgle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Vælg venligst en værdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Vælg de objekter, du vil rette egenskaber for." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Egenskaber/medlemsskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Egenskaber for valgte objekter." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Medlem af" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Tilføj egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaber: {0} / Medlemskaber: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Egenskaber / Medlemskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Skift relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Slet fra relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Slet virkelig det valgte fra relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøgle i alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Fjern egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Ret værdien for den valgte nøgle for alle objekter" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relationer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Åbn en liste over alle relationer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relationer: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Åbn en editor for den valgte relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Slet de nvalgte relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Opret en ny relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Aktuelt valg" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Åbn et vindue med en liste til udvælgelse." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Zoom til valgt(e) element(er)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Zoom til det valgte" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Valgt: Rel.:{0} / Veje:{1} / Punkter:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Markering" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Valgt: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Frigør panelet" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Klik for at minimere/maksimere panelet" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Forfattere" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Åbn en liste af brugere, der arbejder på de valgte objekter." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Forfatter" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# objekter" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5820,19 +5817,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Hent alle ufuldstændige veje og punkter der er forbundet" -msgstr[1] "Hent alle ufuldstændige veje og punkter der er forbundet" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Hent lokalitet" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Henter udvidelsen {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -5850,14 +5846,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Anvend Preset" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Åbn en editor for den valgte relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5866,14 +5860,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5883,9 +5877,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5895,15 +5889,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5911,5 +5905,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5917,20 +5911,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5939,70 +5933,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Sport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "Flyt det nuværende valgte medlem op" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "Flyt det nuværende valgte medlem ned" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6011,9 +6004,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6022,48 +6015,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +msgstr "Tilføj de aktuelle opdateringer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +msgstr "Tilføj opdateringerne og luk dialogboksen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +msgstr "Fortryd opdateringerne og luk dialogboksen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Hent alle ufuldstændige veje og punkter der er forbundet" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Hent medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6073,34 +6065,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6212,10 +6204,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6225,5 +6217,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6309,9 +6301,4 @@ msgid "Download Area" msgstr "Hent område" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Hent" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6612,6 +6599,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6624,6 +6609,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6894,4 +6877,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7114,5 +7101,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7155,116 +7142,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Navn" @@ -7288,15 +7275,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7467,10 +7454,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7478,5 +7465,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7484,9 +7471,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7601,6 +7588,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "ukendt" @@ -7622,13 +7609,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7661,4 +7648,116 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synkronisér hele datasættet" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "Klik for at downloade alle forælder-veje for punkt {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Angiv en kort kommentar for de ændringer, du uploader:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" msgstr "" @@ -7679,39 +7778,148 @@ msgstr "Intet rettesæt åbent" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Intet rettesæt åbent" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Lukker rettesæt" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Lukker rettesæt" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Gem brugernavn og kodeord (ukrypteret)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Indtast venligst et brugernavn" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Indtast nogle nøgleord om din sporing" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Advarsel: Kodeordet sendes ukrypteret." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Atletik" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Skift relation" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7778,17 +7986,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7801,9 +8009,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7817,9 +8025,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7834,50 +8042,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Smid væk og afslut" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7885,5 +8093,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7956,40 +8164,375 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Opdater objekter" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "avanceret" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Indstil tilgængelige udvidelser" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Ukendt rolle \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Send ændringer" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Om" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Der er ingen valgte objekter at opdatere" +msgstr[1] "Der er ingen valgte objekter at opdatere" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Vælg venligst rækken, der skal slettes" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Tilføjede objekter:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Ændrede objekter:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Slettede objekter:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7998,5 +8541,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8005,5 +8548,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8012,208 +8555,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Send ændringer" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Indtast venligst først de ønskede koordinater." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Angiv en kort kommentar for de ændringer, du uploader:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} meter" -msgstr[1] "{0} meter" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Indtast venligst et brugernavn" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps-punkt" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Tilpas linjetegning" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Brug globale indstillinger." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Tegn linjer mellem punkter for dette lag." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Tegn ikke linjer mellem punkter for dette lag." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Vælg linjetegnings-indstillinger" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8221,5 +8593,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8228,5 +8600,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8308,5 +8680,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Beskrivelse" @@ -8338,10 +8710,10 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Konvertér til datalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8351,12 +8723,12 @@ "
Hvis du vil uploade traces, så kig her:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8365,29 +8737,29 @@ msgstr "Konverteret fra: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Hent fra OSM langs dette spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Hent alt inden for:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8398,10 +8770,10 @@ "du
at fortsætte?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" "Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8409,5 +8781,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8415,23 +8787,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "uden for det hentede område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8440,5 +8812,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8452,5 +8824,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8463,11 +8835,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8476,36 +8848,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} består af:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "API-version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8513,5 +8885,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8520,5 +8892,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8526,5 +8898,5 @@ msgstr[1] "punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8533,5 +8905,5 @@ msgstr[1] "et spor med {0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8540,5 +8912,5 @@ msgstr[1] "{0} består af {1} spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8547,24 +8919,24 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX-filer (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Filen {0} er hentet, dog under navnet \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Fejl ved indlæsning {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Kunne ikke læse \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8576,34 +8948,34 @@ "vælg en tidszone

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Tidspunkt for foto (fra EXIF):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "GPS-tidspunkt (aflæst fra ovenstående foto): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/åååå tt:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Jeg er i tidszonen: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Ingen dato" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Åbn et andet foto" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synkronisér tiden fra et billede på GPS-modtageren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8613,70 +8985,155 @@ "Brug venligst det angivne format" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Ugyldig dato" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX-spor: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Åben endnu en GPX-sporing" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Automatisk gæt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Opdater position for: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Tidszone: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Forskydning:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Jeg kan tage et billede af min GPS-modtager.
Hjælper det?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Opdater position for: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alle billeder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Billeder uden EXIF-position" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Endnu ikke taggede billeder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Intet er valgt!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Tilpas billeder med GPX-spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Sammenhold" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Automatisk gæt" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Ugyldig tidszone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Ugyldig forskydning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Tidszone: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Minutter: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekunder: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Tidsforskel på {0} dage)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Justér tidszone og forskydning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "Det valgte billede rummer ingen tidsangivelse" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Billederne rummer ingen tidsangivelser" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX-sporet har ingen tidsangivelser." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "Du bør vælge et GPX-spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "Intet valgt GPX-spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8687,9 +9144,5 @@ "Forventet format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Ugyldig tidszone" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8700,134 +9153,56 @@ "Forventet format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Ugyldig forskydning" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX-spor hentet" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Det valgte billede rummer ingen tidsangivelse" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Billederne rummer ingen tidsangivelser" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX-sporet har ingen tidsangivelser." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Tidszone: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minutter: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekunder: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Tidsforskel på {0} dage)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Forskydning mellem spor og billeder: {0}m {1}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Justér tidszone og forskydning" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standardværdier" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Trækker GPS-lokaliteter ud fra EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Indlæs billeder..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Indlæser {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Kan ikke hente den kanoniske sti for mappen {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Tjekker mappen {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Fandt en null-fil i mappen {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Fejl ved hentning af filer fra mappen {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Geotaggede billeder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Sammenhold med GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8835,52 +9210,99 @@ msgstr[1] "billeder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} blev fundet, som skal gps-tagges" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Filen kunne ikke findes." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Intet billede" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Henter {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Fejl i fil {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Vis geotaggede billeder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Forrige" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Forrige billede" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Skift: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Fjern foto fra lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Slet fra relation" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Næste" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Næste billede" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Centrer synsfelt" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8891,5 +9313,5 @@ "Højde: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8988,4 +9410,12 @@ msgid "Error displaying URL" msgstr "Fejl ved visning af URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9200,7 +9630,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Alle" @@ -9269,6 +9698,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Cykel" @@ -9664,31 +10093,92 @@ msgstr "Projiceringen {0} kunne ikke aktiveres. Benytter Mercator." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Aktiver proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonym" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Vandrerhjem" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Port:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Kodeord" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Proxy-indstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Proxyserver-vært" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Proxyserver-port" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Proxyserver-brugernavn" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Proxyserver-kodeord" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "Basis URLen for OSM serveren (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "Login-navn (e-mail) til OSM-kontoen." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Login-kodeord til OSM-kontoen. Efterlad blank for ikke at gemme noget " +"kodeord." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Grundlæggende URL til server" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "OSM-brugernavn (e-mail)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM-kodeord" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9976,5 +10466,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9984,13 +10474,13 @@ msgstr[1] "Fjern gamle nøgler fra op til {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9998,18 +10488,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Valgfri attributter:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Ukendt type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10020,16 +10510,16 @@ msgstr "Kunne ikke læse den forudindstillede kilde til tagging: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Fejl ved fortolkning af {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementer af typen {0} er understøttet." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10038,18 +10528,18 @@ msgstr[1] "Ret {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Udvælgelse uegnet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Anvend Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Ret egenskaber" @@ -10078,4 +10568,11 @@ msgstr "Henter punkter {0} til {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10091,12 +10588,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, måske på grund af manglende tags." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Forbereder data..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "uventet kolonne-nummer {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10199,16 +10751,16 @@ msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10218,40 +10770,40 @@ msgstr "Downloader OSM-data..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10259,10 +10811,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Henter punkter {0} til {1}..." -msgstr[1] "Henter punkter {0} til {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10299,14 +10851,14 @@ msgstr "Fejl ved NMEAimport!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10315,16 +10867,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10332,66 +10884,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Lukker rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Forbereder..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Uploader..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Forbereder data..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Ret {0} objekt" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10418,4 +10981,14 @@ msgid "Invalid bz2 file." msgstr "Ugyldig bz2-fil." + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10426,5 +10999,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10451,5 +11024,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10457,5 +11030,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10468,5 +11041,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10477,59 +11050,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Forkert brugernavn eller kodeord" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Advarsel: Kodeordet sendes ukrypteret." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Gem brugernavn og kodeord (ukrypteret)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Indtast kodeord" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Login" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "Basis URLen for OSM serveren (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "Login-navn (e-mail) til OSM-kontoen." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Login-kodeord til OSM-kontoen. Efterlad blank for ikke at gemme noget " -"kodeord." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Grundlæggende URL til server" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "OSM-brugernavn (e-mail)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM-kodeord" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10619,5 +11139,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10626,38 +11153,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10665,19 +11192,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Ufuldstændig -specifikation med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Ugyldigt objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10687,8 +11214,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10698,25 +11225,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10724,5 +11267,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10731,5 +11274,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10737,5 +11280,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10744,13 +11287,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Forbereder OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10773,21 +11316,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Henter åbne rettesæt ..." +msgstr[1] "Henter åbne rettesæt ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Henter åbne rettesæt ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10815,9 +11370,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10877,5 +11428,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10885,4 +11436,9 @@ msgid "Uploading data ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Slettede eller flyttede primitiver" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10924,12 +11480,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Slet {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Fejl ved sletning af udvidelsesfil: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -10983,9 +11539,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Update plugins" -msgstr "" +msgstr "Opdater udvidelser" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Skip update" -msgstr "" +msgstr "Spring over opdatering" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 @@ -11071,9 +11627,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "Ingen beskrivelse er tilgængelig" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Flere detaljer" @@ -11093,5 +11649,5 @@ #, java-format msgid "Plug-in named {0} is not available. Update skipped." -msgstr "" +msgstr "Udvidelsen {0} er ikke tilgængelig. Opdateringen er undladt." #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 @@ -11205,4 +11761,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11493,6 +12064,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Send sporinger" @@ -11578,5 +12149,5 @@ msgstr "Sender GPX-spor" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Sender sporinger til openstreetmap.org" @@ -11587,5 +12158,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Adresse-interpolering" @@ -11600,11 +12171,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Ulige" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Lige" @@ -11615,24 +12183,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Nummer" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "kul" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "billede" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Udlejning" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11650,7 +12214,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "indre segment" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11763,5 +12326,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11823,21 +12386,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Vælg fra..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11846,13 +12409,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11877,17 +12440,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Tilvælg automatisk caching." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Maks. cachestørrelse (i MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11899,18 +12462,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Kilde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11920,5 +12483,5 @@ "defineret i JOSM-indstillingerne." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11926,53 +12489,50 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fast størrelse (fra 25 til 1.000 meter)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Ældste filer bliver automatisk slettet, når denne størrelse overskrides." -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Tilføj \"source=...\" til elementer?" @@ -12174,5 +12734,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12363,5 +12923,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Intet data indlæst." @@ -12383,9 +12943,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "Ret gpx-spor" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12771,7 +13331,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "vand" @@ -12921,19 +13481,19 @@ msgstr "Kunne ikke hente billede" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Forbinder" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Forbundet" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Ikke forbundet" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Forbindelsen mislykkedes" @@ -12972,32 +13532,32 @@ msgstr "LiveGPS-lag" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "Forbind til gpsd-server og vis nuværende position i LiveGPS-lag" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Centrér LiveGPS-laget til nuværende position." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Auto-centrér" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Centrér LiveGPS-laget løbende til den nuværende position." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13048,9 +13608,9 @@ msgstr "Kan ikke tegne uden for verdenen." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Mål" @@ -13088,5 +13648,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13097,13 +13657,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13248,5 +13808,5 @@ msgstr "Firefox-programfil" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13338,5 +13898,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13412,41 +13972,41 @@ msgstr "Indtast vægtede værdier" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Hent tern" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Hent alle tern" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Øg zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Reducer zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13615,4 +14175,43 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Lige" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Laveste nummer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Højeste nummer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Veje" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Højeste nummer" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13631,42 +14230,20 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Finmask bygning til rækkehuse" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Opretter individuelle bygninger fra en aflang bygning" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Højeste nummer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Laveste nummer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Vejnavn" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Valgfri" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13681,5 +14258,5 @@ msgstr "Ingen valideringsfejl" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Gitter" @@ -14338,38 +14915,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "bygning" @@ -14383,5 +14930,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "område" @@ -14497,10 +15044,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15213,6 +15760,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Reference" @@ -15658,5 +16205,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Bredde (meter)" @@ -15774,5 +16321,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15784,5 +16331,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "træ" @@ -16040,4 +16587,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16069,8 +16619,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "ja" @@ -16218,9 +16770,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "nej" @@ -16465,5 +17018,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "beboelse" @@ -16498,5 +17051,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "" @@ -16530,6 +17083,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "" @@ -16579,5 +17132,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "rundkørsel" @@ -16765,6 +17318,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Vandring" @@ -16885,5 +17438,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16909,4 +17461,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16916,15 +17469,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Selskab" @@ -17136,7 +17689,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Højde" @@ -17555,5 +18108,5 @@ msgstr "mose" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17563,5 +18116,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "" @@ -18087,32 +18640,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Åbningstider" @@ -18171,91 +18724,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18270,5 +18823,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18287,7 +18840,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "" @@ -18303,5 +18856,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "" @@ -18314,6 +18867,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Gebyr" @@ -18352,22 +18905,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Bilmekaniker" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Ret bilmekaniker" @@ -18375,5 +18916,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Udlejning" @@ -18382,10 +18923,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Ret biludlejning" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Deling" @@ -18393,5 +18934,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "" @@ -18399,10 +18940,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Ret cykelparkering" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Kapacitet" @@ -18411,22 +18952,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Ret cykeludlejning" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Ret cykelhandler" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Offentlig transport" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18436,5 +18970,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18442,5 +18976,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-reference" @@ -18448,5 +18982,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Jernbane-stop" @@ -18454,5 +18988,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Ret stop" @@ -18460,5 +18994,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Sporvogns-stop" @@ -18467,5 +19001,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Ret sporvogns-stop" @@ -18473,5 +19007,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Jernbaneplatform" @@ -18480,5 +19014,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Redigér jernbaneplatform" @@ -18490,5 +19024,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Spornummer" @@ -18496,10 +19030,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Område" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Indgang til undergrundsbane" @@ -18508,10 +19042,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Ret indgang til undergrundsbane" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "kørestol" @@ -18520,5 +19054,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Rutebilstation" @@ -18527,5 +19061,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Ret rutebilstation" @@ -18533,5 +19067,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Busstop" @@ -18541,5 +19075,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Ret busstop" @@ -18548,17 +19082,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Bænk" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Rutebil-platform" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Ret rutebil-platform" @@ -18566,5 +19108,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -18572,5 +19114,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Ret taxiholdeplads" @@ -18578,5 +19120,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Lufthavn" @@ -18584,15 +19126,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Ret lufthavn" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18600,10 +19142,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Overnatning" @@ -18615,5 +19157,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -18622,15 +19164,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Ret hotel" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Stjerner" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motel" @@ -18638,20 +19180,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Ret motel" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Gæstehus" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Ret gæstehus" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Feriehytte" @@ -18659,10 +19201,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Ret feriehytte" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Vandrerhjem" @@ -18670,30 +19212,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Ret vandrerhjem" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Alpin hytte" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Redigér alpin hytte" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Camping plads" @@ -18701,10 +19243,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Redigér camping plads" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Mad+drikke" @@ -18715,5 +19257,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -18721,5 +19263,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Ret restaurant" @@ -18727,5 +19269,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Køkken" @@ -18733,61 +19275,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italiensk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "kinesisk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "burger" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "græsk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "tysk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indisk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "tyrkisk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asiatisk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thai" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexicansk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japansk" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Fastfood" @@ -18795,9 +19337,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Ret fastfood-restaurant" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Café" @@ -18805,9 +19347,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Ret café" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pub" @@ -18815,18 +19357,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Ret pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Ølhal" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Redigér Ølhal" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Bar" @@ -18834,9 +19376,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Redigér bar" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Natklub" @@ -18844,24 +19386,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Ret natklub" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turisme" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Forlystelse" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Ret forlystelse" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museum" @@ -18869,9 +19411,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Ret museum" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -18880,9 +19422,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Ret zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Udsigtspunkt" @@ -18890,24 +19432,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Redigér udsigtspunkt" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Udkigstårn" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Forlystelsespark" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Ret forlystelsespark" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Kunstværk" @@ -18915,5 +19457,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Redigér kunstværk" @@ -18921,19 +19463,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Informationskontor" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Kort" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18971,5 +19513,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18977,28 +19519,28 @@ msgstr "gade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Nærmere beskrivelse" @@ -19008,5 +19550,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -19014,6 +19556,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Cykling" @@ -19021,5 +19563,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19027,6 +19569,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Skisport" @@ -19034,5 +19576,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19040,46 +19582,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "historie" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "natur" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "dyreliv" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19087,29 +19629,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "" @@ -19117,25 +19659,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Bålplads" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Picnic sted" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Redigér picnic sted" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Historiske steder" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Borg" @@ -19144,19 +19686,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Ret borg" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruiner" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Ret ruiner" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Arkæologisk sted" @@ -19165,9 +19707,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Ret arkæologisk sted" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Slagmark" @@ -19175,10 +19717,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Ret slagmark" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19186,5 +19728,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19192,15 +19734,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monument" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Ret monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Mindesmærke" @@ -19208,55 +19750,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Ret mindesmærke" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 msgid "Leisure" msgstr "Rekreation" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Badeland" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Ret badeland" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Legeplads" @@ -19264,35 +19806,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Ret legeplads" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Fiskeri" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Ret fiskeri" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Sport" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Sportsfaciliteter" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Ret stadion" @@ -19306,6 +19848,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "vælg sportsgren:" @@ -19697,30 +20239,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "sport" @@ -19730,225 +20272,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "multi" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "bueskydning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "atletik" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "australsk fodbold" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basketball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "petanque" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "kano" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "klatring" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "kroket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "hundeløb" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "ridning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gymnastik" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "travbane" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "motor" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "skydebane" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "skating" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "skisport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "fodbold" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "svømning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "bordtennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Idrætscenter" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Ret idrætscenter" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfbane" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Ret golfbane" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Ret minigolf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Multi" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Ret multi" @@ -19987,21 +20529,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "type" @@ -20040,203 +20582,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "bane" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "Bowling" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Ret bowling" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Atletik" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Ret atletik" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Bueskydning" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Ret bueskydning" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Klatring" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Ret klatring" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Redigér cykling" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Hundeløb" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Ret hundeløb" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Ridning" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Ret ridning" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Galopbane" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Ret galopbane" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gymnastik" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Ret gymnastik" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Motorsport" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Ret motorsport" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Skating" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Ret skating" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Ret Skateboard" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Svømning" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Ret svømning" @@ -20244,56 +20786,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Ret skisport" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Sværhedsgrad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "nybegynder" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "let" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "avanceret" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "ekspert" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Skydning" @@ -20301,182 +20843,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Ret skydning" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Sport (bold)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Fodbold" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Ret fodbold" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Amerikansk fodbold" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Ret amerikansk fodbold" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Australsk fodbold" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Ret australsk fodbold" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Ret Baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Ret Basketball" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Ret Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "Golfbane" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Petanque" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Ret petanque" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Ret cricket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Cricketnet" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Ret cricketnet" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Kroket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Ret kroket" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Ret hockey" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Ret pelota" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Ret rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Bordtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Ret bordtennis" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Ret tennis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Bygninger" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Bygning" @@ -20484,5 +21026,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Offentlig bygning" @@ -20490,10 +21032,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Ret offentlig bygning" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Rådhus" @@ -20501,10 +21043,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Ret rådhus" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Ambassade" @@ -20512,10 +21054,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Ret ambassade" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Domhus" @@ -20524,10 +21066,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Ret domhus" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Fængsel" @@ -20536,10 +21078,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Ret fængsel" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Politi" @@ -20549,10 +21091,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Ret politi" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Brandstation" @@ -20561,10 +21103,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Ret brandstation" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Posthus" @@ -20572,5 +21114,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Ret posthus" @@ -20578,15 +21120,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Børnehave" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Ret børnehave" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Skole" @@ -20594,10 +21136,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Ret skole" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Universitet" @@ -20605,10 +21147,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Ret universitet" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "" @@ -20616,5 +21158,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "" @@ -20622,5 +21164,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Biograf" @@ -20629,10 +21171,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Ret biograf" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Bibliotek" @@ -20641,9 +21183,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Ret bibliotek" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Kunstcenter" @@ -20651,10 +21193,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Redigér kunstcenter" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Teater" @@ -20663,10 +21205,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Ret teater" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Sted for tilbedelse" @@ -20676,5 +21218,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Ret sted for tilbedelse" @@ -20683,6 +21225,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religion" @@ -20691,66 +21233,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "buddhistisk" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "kristen" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hinduistisk" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jainistisk" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "jødisk" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "muslimsk" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spiritistisk" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoistisk" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "unitar" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastristisk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Trosretning" @@ -20759,81 +21301,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglikansk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptistisk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "katolsk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangelisk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "Jehovas Vidner" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "luthersk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "metodistisk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormonsk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "ortodoks" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pinsebevægelsen" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "prebyteriansk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestantisk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "kvæker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "shiitisk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunnitisk" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adresser" @@ -20842,5 +21384,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Ret adresseinformation" @@ -20848,5 +21390,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Husnummer" @@ -20854,20 +21396,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Husnavn" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Vejnavn" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Bynavn" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Postnummer" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Landekode" @@ -20876,5 +21423,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Ret adresse-interpolering" @@ -20882,61 +21429,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Nummereringssystem" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "ulige" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "lige" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "alfabetisk" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Menneskeskabt" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Fabrik" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Ret fabrik" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Tårn" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Ret tårn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20944,25 +21491,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Vandtårn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Ret vandtårn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gasbeholder" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Ret gasbeholder" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Fyrtårn" @@ -20970,10 +21517,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Ret fyrtårn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Vejrmølle" @@ -20981,10 +21528,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Ret vejrmølle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Rørledning" @@ -20993,37 +21540,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Ret rørledning" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Rensningsanlæg" @@ -21033,10 +21580,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Ret rensningsanlæg" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Kran" @@ -21044,10 +21591,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Ret kran" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Pejlemærke" @@ -21055,10 +21602,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Ret Pejlemærke" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "" @@ -21066,10 +21613,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Overvågning" @@ -21077,5 +21624,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Ret overvågningskamera" @@ -21083,5 +21630,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Generator" @@ -21091,35 +21638,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Ret generator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "vind" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "vand" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "arom" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "kul" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "sol" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Kraftværk" @@ -21128,10 +21675,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Ret kraftværk" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -21140,5 +21687,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Ret transformatorstation" @@ -21146,10 +21693,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Elmast" @@ -21160,23 +21707,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Ret elmast" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Strømkabel" @@ -21185,75 +21732,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Ret strømkabel" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Spænding" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Faciliteter" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Toiletter" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Postkasse" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefon" @@ -21262,5 +21809,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Ret telefon" @@ -21268,5 +21815,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Mønter" @@ -21274,5 +21821,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Sedler" @@ -21280,5 +21827,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21286,5 +21833,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "" @@ -21292,15 +21839,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Genbrug" @@ -21309,5 +21856,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Ret genbrugsplads" @@ -21315,68 +21862,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Dåser" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Tøj" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papir" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Skrotjern" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Bænk" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21447,39 +21989,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Skydetelt" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Ret skydetelt" @@ -21488,30 +22030,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Højde" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "lav" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "halv" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "fuld" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Skjul" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Springvand" @@ -21520,10 +22062,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Ret springvand" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Vandpost" @@ -21532,10 +22074,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Ret vandpost" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Babyluge" @@ -21543,33 +22085,56 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Ret babyluge" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +msgid "Bike Dealer" +msgstr "" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Ret cykelhandler" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarked" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Ret supermarked" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Købmand" @@ -21577,9 +22142,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Ret købmand" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosk" @@ -21587,27 +22152,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Ret kiosk" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Automat" @@ -21615,5 +22180,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Ret automat" @@ -21621,88 +22186,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Varer i automat" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "P-automat" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "mad" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "drikke" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "cigaretter" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "billeder" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "dyremad" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "legetøj" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "frimærker" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tamponer" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "høm-høm-pose" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Slagter" @@ -21710,9 +22275,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Ret slagter" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Bager" @@ -21720,9 +22285,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Ret bager" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Blomsterhandler" @@ -21730,18 +22295,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Ret blomsterhandler" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Sprit" @@ -21749,54 +22314,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Redigér spritbutik" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Drikkevarer" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Redigér drikkevarebutik" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Ret computerforretning" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Elektronik" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Ret elektronikforretning" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hi-fi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Ret hi-fi-forhandler" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Møbelforretning" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Ret møbelforretning" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Havecenter" @@ -21804,9 +22369,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Redigér havecenter" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21814,9 +22379,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Gør-det-selv-butik" @@ -21824,54 +22389,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Ret gør-det-selv-butik" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Frisør" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Ret frisør" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Sko" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Ret skobutik" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Legetøjsbutik" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Redigér legetøjsbutik" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Redigér videobutik" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Kemisk renseri" @@ -21879,9 +22444,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Ret kemisk renseri" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Vaskeri" @@ -21889,9 +22454,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Ret vaskeri" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "" @@ -21899,28 +22464,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Ret sportsbutik" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Optiker" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Ret optiker" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Penge" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Bank" @@ -21928,14 +22493,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Ret bank" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Pengeautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Vekselkontor" @@ -21943,5 +22508,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Ret vekselkontor" @@ -21949,15 +22514,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Ret pengeautomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Sundhed" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Lægehus" @@ -21965,18 +22530,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Ret lægehus" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Tandlæge" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Ret tandlæge" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Apotek" @@ -21984,5 +22549,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Ret apotek" @@ -21990,9 +22555,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Håndkøb" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Hospital" @@ -22000,10 +22565,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Ret Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -22012,5 +22577,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -22019,20 +22584,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(brug forvalgskode, fx +12-345-67890)" @@ -22040,5 +22605,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Dyrlæge" @@ -22047,64 +22612,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Ret dyrlæge" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Steder" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Ret et kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Ret land" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Stat" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Ret stat" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Ret region" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Amt" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Ret amt" @@ -22112,15 +22677,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "By" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Ret by" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Mindre by" @@ -22128,10 +22693,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Ret mindre by" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Forstad" @@ -22139,25 +22704,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Ret forstad" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "By" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Ret by" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Landsby" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Ret landsby" @@ -22165,5 +22730,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Egn" @@ -22171,10 +22736,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Ret lokalitet" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Ø" @@ -22182,10 +22747,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Ret ø" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22193,5 +22758,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22199,5 +22764,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Huleindgang" @@ -22205,10 +22770,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Ret huleindgang" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Tinde" @@ -22216,10 +22781,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Ret tinde" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Gletsjer" @@ -22227,10 +22792,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Ret gletsjer" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Vulkan" @@ -22238,70 +22803,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Ret vulkan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Grænser" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "National" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Ret landegrænser" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administrativt" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Ret administrativ grænse" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Civil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Ret civil-grænse" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Politisk" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Ret politisk grænse" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Nationalpark" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Ret grænser for nationalpark" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Brug af land" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Træ" @@ -22310,15 +22875,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Ret et træ" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Skov" @@ -22327,5 +22892,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Ret skov" @@ -22333,17 +22898,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "Nåleskov" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "Løvskov" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "blandet" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Skov" @@ -22352,14 +22917,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Ret skovområde" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Naturreservat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Ret naturreservat" @@ -22367,25 +22932,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Ur" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Ret ur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Krat" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Ret krat" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Højdedrag" @@ -22393,10 +22958,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Ret højdedrag" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Hede" @@ -22404,5 +22969,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Ret hede" @@ -22410,5 +22975,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Gårdsplads" @@ -22417,45 +22982,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Ret gårdsplads" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Eng" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vingård" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Ret vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Kolonihaver" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Ret kolonihave-område" @@ -22463,25 +23028,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Have" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Ret have" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Græs" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22489,10 +23054,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22500,20 +23065,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Ret park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Rekreativt område" @@ -22521,5 +23086,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Ret rekreativt område" @@ -22527,15 +23092,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Beboelseområde" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Kirkegård" @@ -22543,9 +23108,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Ret kirkegård" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Kirkegård" @@ -22553,39 +23118,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Ret kirkegård" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Detailhandel" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Ret område for detailhandel" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Industri" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Ret industri-område" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "" @@ -22593,15 +23158,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militært område" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Ret militært område" @@ -22609,55 +23174,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Byggeplads" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Ret område for byggeplads" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Stenbrud" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Ret stenbrudsområde" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multipolygon" @@ -22667,5 +23232,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Ret multipolygon" @@ -22674,10 +23239,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "ydre segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "indre segment" @@ -22685,5 +23250,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22692,5 +23257,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22698,34 +23263,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "" @@ -22734,15 +23299,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "" @@ -22750,5 +23315,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Rute" @@ -22757,5 +23322,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Ret rute" @@ -22763,5 +23328,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22833,24 +23398,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "cykel" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "vej" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "færge" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "ski" @@ -22903,5 +23468,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22910,13 +23475,13 @@ msgstr "fod" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "vandre" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "omvej" @@ -22930,10 +23495,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "undergrundsbane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Symbol beskrivelse" @@ -22941,31 +23506,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Netværk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "foreslået" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "midlertidig" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Farve (hex)" @@ -22974,30 +23539,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "rute-segment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23208,130 +23773,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23348,98 +23787,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "" @@ -23816,7 +24164,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23880,13 +24228,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "bane" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23902,5 +24329,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23914,5 +24341,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23933,5 +24360,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "" @@ -23946,5 +24373,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23959,5 +24386,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "flodbred" @@ -23971,5 +24398,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "" @@ -23983,5 +24410,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "" @@ -24003,16 +24430,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "akvædukt" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24109,4 +24524,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24175,13 +24597,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "menneskeskabt" @@ -24227,6 +24649,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24243,7 +24665,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24266,10 +24688,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24305,11 +24727,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24350,6 +24773,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24363,5 +24786,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -24383,5 +24806,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24395,5 +24818,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24401,4 +24824,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24448,7 +24878,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "" @@ -24465,5 +24895,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24478,5 +24908,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24491,5 +24921,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24504,5 +24934,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24517,5 +24947,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24530,5 +24960,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24648,11 +25078,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "" @@ -24666,5 +25096,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "" @@ -24678,5 +25108,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "rørledning" @@ -24804,12 +25234,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "rekreation" @@ -24823,5 +25270,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "marina" @@ -24859,4 +25306,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24875,4 +25338,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24893,8 +25364,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -24996,10 +25469,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25253,5 +25726,5 @@ #. #. -#. +#. #. color health #. @@ -25397,4 +25870,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25414,23 +25895,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25462,6 +25943,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25522,14 +26003,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "helbred" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25876,5 +26357,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25897,5 +26377,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "butik" @@ -25967,8 +26448,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotel" @@ -26069,9 +26550,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turisme" @@ -26159,9 +26640,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "historisk" @@ -26175,5 +26656,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "stenbrud" @@ -26187,5 +26668,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26207,5 +26688,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "" @@ -26219,5 +26700,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "skov" @@ -26231,5 +26712,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26252,5 +26733,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "" @@ -26264,5 +26745,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "industri" @@ -26276,5 +26757,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26288,5 +26769,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26300,5 +26781,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26355,7 +26836,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "militær" @@ -26369,5 +26850,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "kirkegård" @@ -26380,5 +26861,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "" @@ -26393,5 +26874,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "gletsjer" @@ -26405,5 +26886,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "vulkan" @@ -26458,8 +26939,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26473,5 +26954,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "buskads" @@ -26485,5 +26966,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "hede" @@ -26497,5 +26978,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26509,5 +26990,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "" @@ -26521,5 +27002,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "strand" @@ -26597,8 +27078,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "" @@ -26646,7 +27127,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "grænse" @@ -26796,11 +27277,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "sted" @@ -26848,6 +27329,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adresse" @@ -27203,80 +27684,81 @@ msgstr "" -#~ msgid "Images for {0}" -#~ msgstr "Billeder for {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Indlæs GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Intet tidspunkt for punkt {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Ingen billeder med læsbare tidsstempler fundet" - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS-start: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS-slut: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "nuværende forskel: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "tidszone-forskel: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} inden for sporet." - -#~ msgid "Sync clock" -#~ msgstr "Synkronisér ur" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Datoen i filen \"{0}\" kunne ikke forstås." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"." - -#~ msgid "Image" -#~ msgstr "Billede" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "GPS-enhedens tidszone (forskel fra foto)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Synkronisér tidspunkt med GPS-enhed" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Den indtastede tid kunne ikke forstås." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Geotaggede billeder" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Åbn billeder med AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "osmarender-indstillinger" +#~ msgid "Updating primitive" +#~ msgstr "Opdaterer primitiv" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Forventede slutparentes." #~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Endnu en geotag-udvidelse for JOSM. Sammeholder billeder med GPS-spor " -#~ "samt importerer EXIF-geotaggede billeder." +#~ "Det nuværende antal ændringer overskrider det maksimale antal; nuværende " +#~ "er {0}, maksimum er {1}" #~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Adskillige funktioner, der gør dit arbejde lettere: Fx forenkl vej, " -#~ "sammensæt områder, spring til position." +#~ "Jeg kan tage et billede af min GPS-modtager.
Hjælper det?" + +#~ msgid "All images" +#~ msgstr "Alle billeder" + +#~ msgid "Images with no exif position" +#~ msgstr "Billeder uden EXIF-position" + +#~ msgid "Not yet tagged images" +#~ msgstr "Endnu ikke taggede billeder" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPX-spor hentet" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Forskydning mellem spor og billeder: {0}m {1}s" + +#~ msgid "Default Values" +#~ msgstr "Standardværdier" + +#~ msgid "Enable proxy server" +#~ msgstr "Aktiver proxyserver" + +#~ msgid "Anonymous" +#~ msgstr "Anonym" + +#~ msgid "Proxy server host" +#~ msgstr "Proxyserver-vært" + +#~ msgid "Proxy server port" +#~ msgstr "Proxyserver-port" + +#~ msgid "Proxy server username" +#~ msgstr "Proxyserver-brugernavn" + +#~ msgid "Proxy server password" +#~ msgstr "Proxyserver-kodeord" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, måske på grund af manglende tags." + +#~ msgid "Preparing..." +#~ msgstr "Forbereder..." + +#~ msgid "Uploading..." +#~ msgstr "Uploader..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Forkert brugernavn eller kodeord" + +#~ msgid "Enter Password" +#~ msgstr "Indtast kodeord" + +#~ msgid "Login" +#~ msgstr "Login" + +#~ msgid "Optional" +#~ msgstr "Valgfri" + +#~ msgid "aqueduct" +#~ msgstr "akvædukt" #~ msgid "Move" @@ -27285,7 +27767,4 @@ #~ msgid "No data imported." #~ msgstr "Intet data importeret." - -#~ msgid "File could not be found." -#~ msgstr "Filen kunne ikke findes." #~ msgid "Please report a ticket at {0}" @@ -27371,4 +27850,43 @@ #~ msgstr "navn" +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Ingen billeder med læsbare tidsstempler fundet" + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS-start: {0}" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Intet tidspunkt for punkt {0} x {1}" + +#~ msgid "Images for {0}" +#~ msgstr "Billeder for {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Indlæs GPX..." + +#~ msgid "Image" +#~ msgstr "Billede" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)" + +#~ msgid "{0} within the track." +#~ msgstr "{0} inden for sporet." + +#~ msgid "Sync clock" +#~ msgstr "Synkronisér ur" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Datoen i filen \"{0}\" kunne ikke forstås." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"." + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Den indtastede tid kunne ikke forstås." + #~ msgid "Login name (email) to the OSM account." #~ msgstr "Login-navn (e-mail) til OSM-kontoen." @@ -27498,4 +28016,13 @@ #~ msgstr "Anmod om opdatering" +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Åbn billeder med AgPifoJ..." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotaggede billeder" + +#~ msgid "osmarender options" +#~ msgstr "osmarender-indstillinger" + #~ msgid "Unsaved Changes" #~ msgstr "Ugemte ændringer" @@ -27547,4 +28074,13 @@ #~ msgid "bicyclemap" #~ msgstr "cykelkort" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS-enhedens tidszone (forskel fra foto)" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS-slut: {0}" + +#~ msgid "timezone difference: " +#~ msgstr "tidszone-forskel: " #~ msgid "" @@ -27627,4 +28163,7 @@ #~ msgid "Only one node selected" #~ msgstr "Kun et punkt er valgt" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synkronisér tidspunkt med GPS-enhed" #~ msgid "History of Element" @@ -27754,4 +28293,11 @@ #~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede " #~ "elementer har en historik." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Adskillige funktioner, der gør dit arbejde lettere: Fx forenkl vej, " +#~ "sammensæt områder, spring til position." #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" @@ -27816,4 +28362,7 @@ #~ "datalag?" +#~ msgid "current delta: {0}s" +#~ msgstr "nuværende forskel: {0}s" + #~ msgid "" #~ "Internal Error: cannot check conditions for no layer. Please report this " @@ -27934,4 +28483,11 @@ #~ msgstr "% af længde:" +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Endnu en geotag-udvidelse for JOSM. Sammeholder billeder med GPS-spor " +#~ "samt importerer EXIF-geotaggede billeder." + #~ msgid "Directly load TCX files from JOSM." #~ msgstr "Hent TCX-filer direkte fra JOSM." Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 19198) +++ /applications/editors/josm/i18n/po/de.po (revision 19199) @@ -5,11 +5,12 @@ # Matthias Merz , 2008. # Dirk Stöcker , 2008, 2009. +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-12-01 12:37+0000\n" -"Last-Translator: vsandre \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-17 09:16+0000\n" +"Last-Translator: Gubaer \n" "Language-Team: Deutsch\n" "MIME-Version: 1.0\n" @@ -17,38 +18,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:30+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Hauptfenster erzeugen" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hilfe" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoriere die ungültige URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -60,21 +61,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -95,19 +96,8 @@ msgstr "Warnung" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoriere die ungültige Datei-URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"Datei \"{0}\" kann nicht gelesen werden.
Fehler lautet:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -115,8 +105,19 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"Datei \"{0}\" kann nicht gelesen werden.
Fehler lautet:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -124,10 +125,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -139,9 +140,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -150,6 +152,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -204,8 +206,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -253,5 +255,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80 msgid "Revision" -msgstr "Version" +msgstr "Revision" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81 @@ -273,5 +275,5 @@ msgstr "Über JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -283,5 +285,5 @@ "fehlschlagen. API-Basis-URL lautet: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -292,5 +294,5 @@ "Nutzerseiten wird wahrscheinlich fehlschlagen. API-Basis-URL lautet: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -301,15 +303,20 @@ "mit Browserfenstern
überfüllen und benötigt einige Zeit." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Fortfahren" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -318,29 +325,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -357,5 +365,10 @@ msgstr "Abbrechen" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Der externe Hilfe-Browser konnte nicht geöffnet werden" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -373,5 +386,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Vereinen" @@ -391,15 +404,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Knotenpunkt hinzufügen..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Knoten durch Eingabe von Länge und Breite hinzufügen." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -415,22 +428,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Bearbeiten: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Koordinaten des neuen Knotens eingeben." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Verwenden Sie Angaben in Dezimalgrad." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative Werte für die westliche oder südliche Hemisphere." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -439,5 +452,5 @@ msgstr "Breitengrad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -446,28 +459,29 @@ msgstr "Längengrad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "Bitte eine gültige Breite im Bereich -90..90 eingeben" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "Bitte eine Breite im Bereich -90..90 eingeben" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "Bitte eine gültige Länge im Bereich -180..180 eingeben" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "Bitte eine Länge im Bereich -180..180 eingeben" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -479,9 +493,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "Dialog schließen und neuen Knoten anlegen" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "Dialog schließen, keinen neuen Knoten anlegen" @@ -502,18 +516,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -525,5 +539,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -545,6 +559,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -591,5 +605,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "Konflikt" @@ -626,14 +640,15 @@ msgstr "Keine Konflikte, auf die gezoomt werden kann." -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Offene Änderungssätze schließen" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Schließt offene Änderungssätze" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -643,21 +658,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Datei: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Es existieren keine offenen Änderungssätze" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Keine offenen Änderungssätze" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Offene Änderungssätze herunterladen..." @@ -744,11 +759,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -826,16 +842,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -871,5 +892,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplizieren" @@ -912,10 +933,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Als GPX exportieren..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Die Daten ins GPX-Format exportieren." @@ -930,12 +951,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -960,8 +981,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -972,10 +993,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -988,17 +1009,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1036,22 +1057,27 @@ msgstr "Informationen über Wege, Knoten oder Relationen anzeigen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Überlappende Flächen verbinden" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Sich überlappende Flächen miteinander verbinden" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Bitte mindestens einen geschlossenen Weg zum Vereinigen wählen." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Momentan können nur maximal zwei Flächen vereinigt werden." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" ist nicht geschlossen und kann deshalb nicht vereinigt werden." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1065,38 +1091,34 @@ "Sind Sie sich sicher, dass Sie fortfahren wollen?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Bitte abbrechen, falls Sie nicht sicher sind" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Bitte mindestens einen geschlossenen Weg zum Vereinigen wählen." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Knoten auf allen Schnittpunkten erstellt" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Wege entfernen, die nicht teil des inneren Multipolygons sind" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Relationen korrigieren" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Selbstüberlappende Gebiete verbunden" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Überlappende Gebiete verbunden" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1106,33 +1128,33 @@ "prüfen Sie, dass keine Fehler entstanden sind." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Werte für alle Konflikte festlegen." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Konflikte auflösen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Merkmalskonflikte beheben" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Elemente aus Relationen entfernt" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Flächen verbinden: Kurze Wege entfernen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Weg geschlossen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Merkmale von inneren Wegen entfernen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Funktion zum Flächen verbinden" @@ -1297,5 +1319,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben." @@ -1375,28 +1397,28 @@ msgstr "Daten herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Form rechtwinklig machen" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Knoten so verschieben, dass alle Winkel 90 oder 270 Grad sind" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 msgid "Orthogonalize Shape / Undo" msgstr "Form rechtwinklig anordnen / Rückgängig" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 msgid "Undo orthogonalization for certain nodes" msgstr "Rechtwinklige Anordnung ausgewählter Knoten rückgängig machen" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "Rechtwinklig anordnen / Rückgängig machen" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1408,9 +1430,9 @@ "verschoben wurden." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "Rechtwinklige Anordnung rückgängig machen" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1422,16 +1444,16 @@ "Projektion zum Ausschalten dieser Warnung.
Wollen Sie fortfahren?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Rechtwinklig machen" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Verwendung" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "Die ausgewählten Objekte können nicht rechtwinklig angeordnet werden" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Rechtwinklig machen" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1504,18 +1526,18 @@ msgstr "Die Datei ''{0}'' konnte nicht umbenannt werden" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Richtung der Wege drehen" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Die Richtung aller gewählter Wege umdrehen." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Bitte mindestens einen Weg wählen." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Richtung des Weges drehen" @@ -1524,10 +1546,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Speichern" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Aktuelle Daten speichern." @@ -1584,10 +1606,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Speichern unter..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Aktuelle Daten in einer neuen Datei speichern." @@ -1631,6 +1653,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1666,5 +1687,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1731,5 +1752,5 @@ "in der Mitte des Weges.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1739,5 +1760,5 @@ "kopiert.
Sie sollten dies überprüfen und falls nötig korrigieren." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1747,5 +1768,5 @@ "sollten dies überprüfen und falls nötig korrigieren." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1779,29 +1800,29 @@ msgstr "Dieser Knoten ist mit nichts verbunden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Keiner dieser Knoten ist mit anderen Elementen verbunden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Die aktuelle Auswahl kann nicht zum Auftrennen verwendet werden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Bitte wählen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Ein Knoten mit Merkmalen, oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Ein Knoten, der von mehr als einem Weg genutzt wird, oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" @@ -1809,5 +1830,5 @@ "oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1816,5 +1837,5 @@ "verwendet werden, oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1823,5 +1844,5 @@ "werden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1835,9 +1856,9 @@ "und alle Knoten werden ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Knotenpunkte getrennt" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1845,5 +1866,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1878,10 +1899,10 @@ msgstr "Nichts auswählen (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Daten aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1890,23 +1911,23 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "Daten herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Aktueller Datensatz wurde nicht gefunden" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "Auswahl aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1915,30 +1936,26 @@ "herunterladen)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Auswahl aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "Es sind keine Objekte zur Aktualisierung ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Auswahl leer" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "Objekte aktualisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Daten hochladen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "Alle Änderungen in der aktuellen Datenebene zum OSM-Server hochladen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1949,5 +1966,5 @@ "gelöst werden müssen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1955,161 +1972,7 @@ msgstr "Keine Änderungen zum Hochladen vorhanden." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nichts geändert. Erfassen Sie erst einige Daten." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "Nur Knoten {0} synchronisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "Nur Weg {0} synchronisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Nur Relation {0} synchronisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Ganzen Datensatz synchronisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"Hochladen fehlgeschlagen, da der Server eine neuere " -"Version
von einem Ihrer Knoten, Wege oder Relationen hat.
Der Konflikt " -"wird durch ein Objekt vom Typ {0} mit ID {1} ausgelöst.
Der Server hat Version {2}, Ihre Version ist {3}." -"
Wählen Sie {4}, um dieses Objekt zu synchronisieren." -"
Wählen Sie {5}, um den kompletten lokalen Datensatz mit " -"dem Server zu synchronisieren.
Wählen Sie {6}, um " -"abzubrechen und weiterzuarbeiten." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Konflikte gefunden" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Hochladen fehlgeschlagen, da der Server eine neuere " -"Version
von einem Ihrer Knoten, Wege oder Relationen hat.

Wählen " -"Sie {0}, um den kompletten lokalen Datensatz mit dem Server " -"zu synchronisieren.
Wählen Sie {1}, um abzubrechen und " -"weiterzuarbeiten." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"Hochladen fehlgeschlagen, da der " -"verwendete
Änderungssatz {0} bereits am {1} geschlossen wurde.
Bitte " -"in einen neuen oder in einen vorhandenen, offenen Änderungssatz hochladen." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Änderungssatz geschlossen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "Bereinigen von Konflikten vorbereiten" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "Klicken, um alle Wege mit dem Knoten {0} zu laden" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "Klicken, um abzubrechen und das Editieren der Karte wiederaufzunehmen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" -"Hochladen ist fehlgeschlagen, weil der zu löschende " -"Knoten {0} noch im Weg {1} verwendet wird.

Klicken Sie {2}, um alle Wege mit dem Knoten {0} zu laden.
Falls nötig wird JOSM " -"Konflikte erstellen. Sie können diese anschließend im " -"Konfliktbearbeitungsdialog bereinigen." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "Ein Knoten wird noch benutzt" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" -"Warnung: die Fehlermeldung ''{0}'' stimmt nicht mit einem erwarteten Muster " -"überein" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Objekt aktualisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Daten für Ebene \"{0}\" hochladen" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe " -"dieses Objekt und fahre mit dem Hochladen fort." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" -"Das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe dieses " -"Objekt beim Hochladen." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "Übertrage {0} Objekte zum Server ..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" -"Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die " -"Fehlermeldung war: {0}" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2244,9 +2107,9 @@ msgstr "Heruntergeladene GPS-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Daten herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2256,5 +2119,5 @@ "Fehlermeldung war: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "In diesem Gebiet wurden keine Daten gefunden." @@ -2335,7 +2198,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2352,58 +2215,52 @@ "Knotenpunkte nicht löschen. Strg: Lösche verweisende Objekte." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Zeichnen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Knotenpunkt setzen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Modus: Zeichnen (Fokus)" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "Ausgewählt" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Kann keinen Knoten außerhalb der Welt erstellen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Knotenpunkt hinzufügen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Knotenpunkt in einen Weg einfügen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Existierenden Weg mit Knotenpunkt verbinden" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Einen Knotenpunkt in einen bestehenden Weg einfügen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Knotenpunkt in einen Weg einfügen und verbinden" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Einen neuen Knoten erstellen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Knoten unter Mauszeiger wählen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2412,14 +2269,14 @@ msgstr[1] "Neuen Knoten in {0} Wege einfügen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Neuen Weg an letztem Knoten beginnen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Weg am letzten Knoten fortsetzen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Zeichnen beenden." @@ -2465,18 +2322,19 @@ "Zusätzliches Drücken der Umschalttaste synchronisiert Audio an diesem Punkt." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Auswahl" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Objekte auswählen, verschieben, und drehen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2485,17 +2343,17 @@ msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Elemente verschieben" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Verschieben" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Verschieben rückgängig machen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2508,13 +2366,13 @@ "Wollen Sie sie wirklich verschieben?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Immer verschieben und diese Meldung nicht mehr anzeigen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2523,9 +2381,9 @@ "Punkt vereinigen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Maustaste loslassen, um das Drehen zu stoppen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2537,5 +2395,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zoomen" @@ -2559,5 +2417,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Nach Objekten suchen." @@ -2651,7 +2509,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - Alle von diesem Nutzer geänderten Objekte" +msgstr "" +"user:anonymous - Alle Objekte, die von anonymen Nutzern verändert " +"wurden" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2660,8 +2519,20 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - Objekte mit gegebener Knotenanzahl" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" +"tags:... - Objekte mit gegebener Merkmalsanzahl (tags: anzahl " +"oder tags: min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2671,21 +2542,27 @@ "oder tags: min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - Alle geänderten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - Alle ausgewählten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - Alle unvollständigen Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - Alle Objekte ohne Merkmale" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2694,5 +2571,5 @@ "Ausdrucks" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2701,21 +2578,21 @@ "Ausdrucks" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" "Nutzung von | oder OR zum Kombinieren mittels logischem Oder." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Nutzung von \" zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Nutzung von ( und ) zum Gruppieren von Ausdrücken." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2723,33 +2600,33 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Suche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "Filter bestätigen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Suche starten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Nichts gefunden für Suche ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nichts aus der Auswahl entfernt durch Suche ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" @@ -2757,22 +2634,22 @@ "Bei der Suche nach \"{0}\" konnte in der Auswahl nichts gefunden werden." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "{0} Treffer gefunden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2785,15 +2662,15 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" "Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2802,26 +2679,29 @@ "\"relation\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Unerwartete Daten: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Fehlendes Argument für 'OR'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Fehlendes Argument für 'NICHT'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Schließende Klammer erwartet." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Fehlendes Argument für 'OR'." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "Falsche Anzahl an Parametern für Merkmalsoperator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2832,9 +2712,9 @@ "oder -bereich, z.B. \"tags: 1\" oder \"tags:2-5\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Falsche Anzahl an Parametern für Knoten-Operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2845,7 +2725,12 @@ "oder -bereich, z.B. \"nodes:1-20\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Ungültiger Wert für ID-Operator: {0}. Zahl erwartet." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Ungültiger Wert für ID-Operator: {0}. Zahl erwartet." @@ -2879,45 +2764,35 @@ msgstr "Bei der Verbindung zum Server \"{0}\" ist ein Fehler aufgetreten." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Aktuelle Anzahl an Modifikationen ({0}) überschreitet die maximale Anzahl " -"({1})." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" +"Warnung: automatisches Abschneiden der Wertmarkierung ''{0}'' am gelöschten " +"Objekt {1}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" +"Die Länge des Werts für das Tag \"{0}\" des Objekts {1} überschreitet die " +"Maximallänge {2}. Aktuelle Länge ist {3}." + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Unvereinbarkeit mit notwendigen Voraussetzungen" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" +"Anzahl {0} der Knoten in Weg {1} überschreitet maximal erlaubte Knotenanzahl " +"({2})" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Anforderungen des API verletzt" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Warnung: Der Wert des Merkmals \"{0}\" des gelöschten Objekts {1} wird " -"automatisch abgeschnitten" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"Länge des Wertes ({3}) der Eigenschaft \"{0}\" von Element {1} überschreitet " -"die maximal erlaubte Länge ({2})." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Unvereinbarkeit mit notwendigen Voraussetzungen" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"Anzahl {0} der Knoten in Weg {1} überschreitet maximal erlaubte Knotenanzahl " -"({2})" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -3032,5 +2907,5 @@ msgstr "{0}={1} setzen für {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -3047,5 +2922,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Doppelter Konflikt" @@ -3154,4 +3029,19 @@ msgstr "Konflikte im Löschstatus für {0} auflösen" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3265,5 +3155,5 @@ msgstr "Anwenden?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3348,15 +3238,15 @@ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "Achtung: Fehler beim speichern der Voreinstellungen in \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, 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:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3367,5 +3257,5 @@ "Verzeichnis \"{0}\" ist kein Verzeichnis ist." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3376,5 +3266,5 @@ "\"{0}\" ist kein Verzeichnis ist." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3385,5 +3275,5 @@ "nicht erstellt werden konnte." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3394,5 +3284,5 @@ "Einstellungsverzeichnis konnte nicht erstellt werden: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3402,5 +3292,5 @@ "Standardeinstellungen." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3411,5 +3301,5 @@ "Standardeinstellungen ersetzt." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3420,5 +3310,5 @@ "konnte nicht auf Standardwerte zurückgesetzt werden: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3430,5 +3320,5 @@ "Standardwerten erstellt." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3439,10 +3329,10 @@ "konnte nicht auf Standardwerte zurückgesetzt werden: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, 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:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3452,19 +3342,19 @@ "Lesezeichen-Datei ''{2}''" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Einstellungen auf {0} gespeichert" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Kann keine Einstellungen zum Server laden. Grund: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Kann keine Einstellungen vom Server laden." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" @@ -3472,5 +3362,5 @@ "Fehler: Unerwartete Zeile ''{0}'' in der Liste der Lesezeichen vom Server" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3481,5 +3371,5 @@ "der Lesezeichen vom Server" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3513,5 +3403,5 @@ msgstr "Warnung: die Versions-Datei ''/REVISION'' fehlt" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3533,31 +3423,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "W" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Änderungssatz {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3567,5 +3450,5 @@ "Datensatz enthalten ist" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3580,5 +3463,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" @@ -3586,6 +3469,6 @@ "Beim Zusammenführen wurde der Ziel-Weg für den Weg mit ID {0} nicht gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 #, java-format msgid "Missing merge target for node with id {0}" @@ -3594,5 +3477,5 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 #, java-format msgid "Missing merge target for object with id {0}" @@ -3601,5 +3484,5 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 #, java-format msgid "Missing merge target for relation with id {0}" @@ -3608,5 +3491,5 @@ "nicht gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3617,5 +3500,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3630,5 +3513,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3636,25 +3519,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "S" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "Text" #. column header: apply filter for children -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "C" msgstr "K" #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "I" msgstr "I" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "M" @@ -3662,43 +3545,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "E" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "H" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "L" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "ID >= 0 erwartet, jedoch {0} erhalten." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "ID >= 0 erwartet, jedoch {0} erhalten." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "Version > 0 erwartet, jedoch {0} erhalten." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3708,5 +3603,5 @@ "andere aber nicht." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3741,12 +3636,6 @@ "Schlüssel mit mehreren Werten enthält" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" -"Ein Benutzer mit der gleichen ID aber mit einem unterschiedlichen Namen " -"wurde gefunden" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3755,7 +3644,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3771,5 +3660,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3789,146 +3678,138 @@ msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Flächenförmiger Weg ist nicht geschlossen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Multipolygon-Weg ''{0}'' ist nicht geschlossen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Gelöschtes Element ''{0}'' in der Relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Weg ''{0}'' mit weniger als zwei Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Mehr als ein Weg mit \"from\" gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Mehr als ein Weg mit \"to\" gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Mehr als ein Element mit \"via\" gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Unbekannte Role \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Unbekannter Elementtyp für \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Kein \"from\"-Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Kein \"to\"-Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Kein \"via\"-Knoten oder Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Innerer Weg \"{0}\" ist außerhalb." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Nicht-Weg ''{0}'' im Multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Kein äußerer Weg im Multipolygon ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "Ohne Merkmale" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "Text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "Flächentext" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Fehler: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Warnung: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "Inaktiv" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "Ausgewählt" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3937,6 +3818,6 @@ msgstr[1] "Knotenpunkte" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3945,7 +3826,8 @@ msgstr[1] "Wege" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3954,21 +3836,37 @@ msgstr[1] "Relationen" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "Weg ohne Merkmale" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "Unvollständiger Weg" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "Hintergrund" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "Hervorgehoben" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "Ohne Merkmale" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "Text" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "Flächentext" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -4114,5 +4012,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "Eisenbahn" @@ -4128,7 +4026,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4144,4 +4042,10 @@ msgstr[1] "{0} Elemente" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Änderungssatz {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4173,6 +4077,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Konflikt" @@ -4186,7 +4090,7 @@ msgstr "Objekt gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4273,74 +4177,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Benutzername" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Passwort" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "Verwendung" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "Optionen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Diese Hilfe anzeigen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Standard Unix Geometrie Argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Bounding Box herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Herunterladen der Position aus der URL (mit lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Datei öffnen (als Roh-GPS, wenn .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Bounding Box als GPS-Spuren herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Mit der angegebenen Suche auswählen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Mit maximiertem Fenster starten" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Die Einstellungen auf Standardwerte zurücksetzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Die Sprache festlegen." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "Optionen über die Java-Systemeinstellungen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PFAD/ZU/JOSM/ORDNER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "Verzeichnis für alle Benutzereinstellungen ändern" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4353,9 +4257,9 @@ "wird." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "Beispiele" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4366,36 +4270,36 @@ "--selection verwendet wird." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Anstatt --download= ist auch osm:// möglich\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktualisierte Plugins aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Zeitige Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Voreinstellungen setzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Datei" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4410,22 +4314,22 @@ msgstr "Bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Ansicht" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Werkzeuge" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Vorlagen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4433,5 +4337,5 @@ msgstr "Menü: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Audio" @@ -4512,13 +4416,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "Nutzer:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "Ebene nicht in der Liste." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4553,5 +4458,5 @@ msgstr "Initialisieren" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4561,6 +4466,6 @@ "Relation entfernt werden soll." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4571,5 +4476,5 @@ "Relationen entfernt werden kann." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4580,5 +4485,5 @@ "{1} Relationen entfernt werden sollen." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4587,25 +4492,25 @@ msgstr[1] "{0} Objekte löschen" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "Objekte löschen" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "Zum Löschen" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "Von Relation" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "Pos." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4613,5 +4518,5 @@ msgstr "Rolle" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" @@ -4619,5 +4524,5 @@ "entfernen." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4650,11 +4555,11 @@ msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Eigenschaften" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4663,6 +4568,6 @@ msgstr "Merkmale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4670,6 +4575,6 @@ msgstr "Knoten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4677,23 +4582,23 @@ msgstr "Elemente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Keine verbleibenden Merkmalskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Merkmale ({0} Konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} verbleibende Merkmalskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Knoten(gelöst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4702,17 +4607,17 @@ "Knotenliste des Weges." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Knoten(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Verbleibende Konflikte in der Knotenliste des Weges" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Elemente(gelöst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4722,21 +4627,21 @@ "Elementenliste der Relation." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Elemente(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "Verbleibende Konflikte in der Elementenliste der Relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Keine verbleibenden Eigenschaftskonflikte" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Eigenschaften(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Verbleibende Eigenschaftskonflikte zu beheben" @@ -4768,22 +4673,22 @@ msgstr "Element {0} nicht in der Liste gefunden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "Synchron Rollen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Vergleichen " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Meine Version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Liste der Elemente in meinem (dem lokalen) Datensatz" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4791,5 +4696,5 @@ msgstr "Vereinigte Version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4799,32 +4704,32 @@ "hierdurch ersetzt, wenn die Änderungen bestätigt werden." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Deren Version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Liste der Elemente in deren (dem Server-) Datensatz" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> Kopf" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" "Kopiere meine gewählten Knoten an den Anfang der Liste vereinigter Knoten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> Fuß" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" "Kopiere meine gewählten Elemente an das Ende der Liste vereinigter Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4834,5 +4739,5 @@ "vereinigter Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4842,5 +4747,5 @@ "Liste vereinigter Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4849,10 +4754,10 @@ "Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" "Kopiere deren gewählte Elemente an das Ende der Liste vereinigter Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4862,5 +4767,5 @@ "vereinigter Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4870,23 +4775,23 @@ "der vereinigten Liste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Hoch" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Den ausgewählten Eintrag eine Position nach oben schieben." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Runter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Den ausgewählten Eintrag eine Position nach unten schieben." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4897,28 +4802,28 @@ msgstr "Entfernen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "" "Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Fixieren" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Fixieren" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Aktuelle Liste der vereinigten Elemente fixieren." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Fixierung aufheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Fixierung der aktuellen Liste der vereinigten Elemente aufheben." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4927,5 +4832,5 @@ msgstr "Wähle {0} um das Vereinigen zu beginnen." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4935,5 +4840,5 @@ "Wähle {0} um das Vereinigen abzuschließen." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4942,5 +4847,5 @@ msgstr[1] "Meine Version ({0} Einträge)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4949,5 +4854,5 @@ msgstr[1] "Vereinigte Version ({0} Einträge)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4956,5 +4861,5 @@ msgstr[1] "Deren Version ({0} Einträge)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4966,5 +4871,5 @@ "synchronen Anpassen teilnehmen." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5217,10 +5122,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5230,10 +5135,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5318,9 +5223,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5328,6 +5233,6 @@ msgstr "Kein" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "alle" @@ -5419,7 +5324,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5429,6 +5334,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5556,4 +5461,61 @@ msgstr "Nur Merkmale mit Konflikten anzeigen" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Ausgewählte Objekte löschen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +#, fuzzy +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" +"Auswählen, um Daten in eine neue Ebene zu laden.
Auswahl entfernen, " +"um in die aktuelle Daten-Ebenen zu laden." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Änderungssatz" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "Zu diesem Knoten in der aktuellen Daten-Ebene zoomen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +#, fuzzy +msgid "Select all objects assigned to the currently selected changesets" +msgstr "Ausgewählten offenen Änderungssatz schließen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Daten herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Kartendaten vom OSM-Server laden." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Ausgewählten offenen Änderungssatz schließen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Informationen anzeigen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Editor für die gewählte Relation öffnen" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5567,12 +5529,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5590,18 +5552,18 @@ msgstr "Befehlsliste: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "Konflikte auflösen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5611,25 +5573,25 @@ "Objekte setzen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Konfliktauflösung abbrechen und Fenster schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Gelöste Konflikte anwenden und Fenster schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Lösung anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "Trotzdem schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "Weiter auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5647,26 +5609,26 @@ "Konfliktlösung zurückzukehren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "Konflikt konnte nicht vollständig gelöst werden." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Konflikte auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Konflikte lösen für ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "Objekte filtern und verbergen/deaktivieren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5677,41 +5639,41 @@ msgstr "Hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "Filter hinzufügen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "Filter bearbeiten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "Filter löschen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "Filter nach oben verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "Filter nach unten verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "Filter aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "Elemente verbergen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "Auch auf Kinder anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "Filter invertieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "Filtermodus" @@ -5750,5 +5712,5 @@ msgstr "Geschichte der markierten Elemente anzeigen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5765,34 +5727,34 @@ msgstr "Liste aller geladenen Ebenen öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Ausgewählte Ebene löschen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Anzeigen/Ausblenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Sichtbarkeit der Ebene umschalten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Die ausgewählte Ebene aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Aktuelle Eben mit einer anderen Ebene verbinden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Gewählte Ebene eine Zeile nach oben verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Gewählte Ebene eine Zeile nach unten verschieben." @@ -5802,5 +5764,185 @@ msgstr "Ebeneninformation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Eine Liste aller Relationen öffnen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relationen: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Editor für die gewählte Relation öffnen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Gewählte Relation löschen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Eine neue Relation erstellen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" +"Eine Kopie dieser Relation erstellen und diese in einem neuen Editorfenster " +"öffnen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "Ersetze die aktuelle Auswahl durch die selektierten Relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "Wählen Sie die Mitglieder aller ausgewählten Relationen aus" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "Mitglieder auswählen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "Alle Mitglieder der ausgewählten Relationen laden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "Elemente herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Aktuelle Auswahl" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Ein Fenster mit der aktuellen Auswahl öffnen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Auf ausgewählte Elemente zoomen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Auf Auswahl zoomen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Ausw.: Rel.:{0}/Wege:{1}/Knoten:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Auswahl" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Auswahl: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Ansicht separat darstellen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Die Ansicht schließen. Neuöffnen mit den Schaltflächen in der linken " +"Werkzeugleiste." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Autoren" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "" +"Eine Liste aller Nutzer öffnen, die an den ausgewählten Objekten gearbeitet " +"haben." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} Autor" +msgstr[1] "{0} Autoren" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "Objekte auswählen, die dieser Nutzer eingetragen hat" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "Informationsseite über den Nutzer im Browser öffnen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" +"Warnung: es werden nur Informationsseiten für die ersten {0} der {1} " +"ausgewählten Nutzer im Browser geöffnet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" +"Fehler beim Erstellen der URL, da die Kodierung \"{0}\"
auf diesem " +"System nicht verfügbar ist." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "Fehlende Kodierung" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Objekte" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "unvollständig" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "geschlossener Weg" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Änderungssätze herunterladen..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5809,22 +5951,22 @@ msgstr[1] "Damit werden maximal {0} Objekte geändert." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "Ein leerer Wert löscht den Schlüssel." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Werte ändern?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5833,5 +5975,5 @@ msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5840,236 +5982,71 @@ msgstr[1] "Damit werden maximal {0} Objekte geändert." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Bitte wählen Sie einen Schlüssel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Bitte wählen Sie einen Wert" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Eigenschaften/Mitgliedschaften" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Eigenschaften der ausgewählten Objekte." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Element von" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Eigenschaften hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Eigenschaften / Mitgliedschaften" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Relation ändern" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Aus der Relation entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Auswahl wirklich aus Relation {0} entfernen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Den gewählten Schlüssel von allen Objekten entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Eigenschaften entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Eine Liste aller Relationen öffnen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relationen: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Editor für die gewählte Relation öffnen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Gewählte Relation löschen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Eine neue Relation erstellen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" -"Eine Kopie dieser Relation erstellen und diese in einem neuen Editorfenster " -"öffnen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "Ersetze die aktuelle Auswahl durch die selektierten Relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "Wählen Sie die Mitglieder aller ausgewählten Relationen aus" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "Mitglieder auswählen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "Alle Mitglieder der ausgewählten Relationen laden" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "Elemente herunterladen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Aktuelle Auswahl" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Ein Fenster mit der aktuellen Auswahl öffnen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Auf ausgewählte Elemente zoomen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Auf Auswahl zoomen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Ausw.: Rel.:{0}/Wege:{1}/Knoten:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Auswahl" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Auswahl: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Ansicht separat darstellen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Die Ansicht schließen. Neuöffnen mit den Schaltflächen in der linken " -"Werkzeugleiste." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Autoren" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "" -"Eine Liste aller Nutzer öffnen, die an den ausgewählten Objekten gearbeitet " -"haben." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} Autor" -msgstr[1] "{0} Autoren" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "Objekte auswählen, die dieser Nutzer eingetragen hat" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Informationen anzeigen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "Informationsseite über den Nutzer im Browser öffnen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" -"Warnung: es werden nur Informationsseiten für die ersten {0} der {1} " -"ausgewählten Nutzer im Browser geöffnet" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" -"Fehler beim Erstellen der URL, da die Kodierung \"{0}\"
auf diesem " -"System nicht verfügbar ist." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "Fehlende Kodierung" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Autor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Objekte" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -6134,19 +6111,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Relation ''{0}'' herunterladen" -msgstr[1] "Relation ''{0}'' herunterladen" +msgstr[0] "{0} unvollständiges Kind der Relation \"{1}\" herunterladen" +msgstr[1] "{0} unvollständige Kinder der Relation \"{1}\" herunterladen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Relationselemente herunterladen" +msgstr "Relationen herunterladen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Relation ''{0}'' herunterladen" +msgstr "({0}/{1}: Relation ''{2}'' herunterladen..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -6164,14 +6140,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Rolle anwenden" +msgstr "Rolle anwenden:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Eingeben einer Rolle für alle Relationselemente" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" +"Eine Rolle eingeben und diese auf die gewählten Relationsmitglieder anwenden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -6183,14 +6158,14 @@ "Sie die zirkuläre Abhängigkeit behandeln?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "Objekt entfernen und Verbindung lösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "Ignorieren und die aktuelle Verbindung belassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -6202,9 +6177,9 @@ "

Wollen Sie es ein weiteres Mal in die Relation aufnehmen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 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:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -6217,5 +6192,5 @@ "Relation ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -6224,5 +6199,5 @@ "hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -6231,5 +6206,5 @@ "hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -6239,5 +6214,5 @@ "ausgewählten Element hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -6247,15 +6222,15 @@ "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:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "Relations-Editor: Ausgewählte entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" @@ -6263,5 +6238,5 @@ "Wählen Sie Relationselemente aus, die in der aktuellen Auswahl vorkommen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6272,57 +6247,56 @@ "Auswahl vorkommen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 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:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "Relationselemente sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Sport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "Sortieren" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "Relations-Editor: Sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "Relations-Editor: Nach oben verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "Relations-Editor: Nach unten verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "Das aktuell ausgewählte Element aus dieser Beziehung entfernen" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "Relations-Editor: Entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "Die aktuell bearbeitete Beziehung löschen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "Konflikt erstellen und schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" @@ -6330,9 +6304,9 @@ "schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" @@ -6341,5 +6315,5 @@ "Relation wiederaufzunehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6351,9 +6325,9 @@ "

Soll ein Konflikt erstellt und der Editor geschlossen werden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "Datenkonflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6364,49 +6338,47 @@ "Element
''{1}''.
Bitte lösen Sie diesen Konflikt zunächst auf." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "Aktualisierung übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 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:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 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:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Einen leeren Schlüssel hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Relationselemente herunterladen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "Alle unvollständigen Mitglieder herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "Relations-Editor: Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "Relationselemente herunterladen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "Ausgewählte unvollständige Mitglieder herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 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:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Rolle anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6419,31 +6391,31 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "Übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "Nicht übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "Leere Rolle bestätigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 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/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "Zoomen auf" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" "Auf das Objekt zoomen, auf welches das erste ausgewählte Element verweist" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" @@ -6451,5 +6423,5 @@ "ist" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "Zoom ist deaktiviert, weil kein Element ausgewählt wurde" @@ -6570,10 +6542,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "Bitte geben Sie einen Namen für das Lesezeichen ein." #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "Name des Ortes" @@ -6583,5 +6555,5 @@ msgstr "Entfernt die ausgewählten Lesezeichen" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "Benennt das ausgewählte Lesezeichen um" @@ -6669,9 +6641,4 @@ msgid "Download Area" msgstr "Bereich laden" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Daten herunterladen" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6973,6 +6940,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6985,6 +6950,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -7255,4 +7218,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7475,5 +7442,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7516,116 +7483,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Name" @@ -7649,15 +7616,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "In der Nähe von" @@ -7852,5 +7819,5 @@ msgstr "Versionsprotokoll erneut vom Server laden" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" @@ -7858,6 +7825,6 @@ "Referenzelements." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7867,5 +7834,5 @@ "Referenzobjekts stimmt nicht mit der ID {1} der Objektgeschichte überein." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7875,5 +7842,5 @@ "der Geschichte nicht vorhanden." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" @@ -7881,5 +7848,5 @@ "aktuellen Elements." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7994,6 +7961,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "unbekannt" @@ -8018,13 +7985,13 @@ msgstr "anonym" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Changeset info" msgstr "Informationen zum Änderungssatz" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Launch browser with information about the changeset" msgstr "Externen Browser mit Informationen zum Änderungssatz öffnen" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -8059,4 +8026,141 @@ msgstr "Version" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Nur Knoten {0} synchronisieren" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Nur Weg {0} synchronisieren" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Nur Relation {0} synchronisieren" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Ganzen Datensatz synchronisieren" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Hochladen fehlgeschlagen, da der Server eine neuere " +"Version
von einem Ihrer Knoten, Wege oder Relationen hat.
Der Konflikt " +"wird durch ein Objekt vom Typ {0} mit ID {1} ausgelöst.
Der Server hat Version {2}, Ihre Version ist {3}." +"
Wählen Sie {4}, um dieses Objekt zu synchronisieren." +"
Wählen Sie {5}, um den kompletten lokalen Datensatz mit " +"dem Server zu synchronisieren.
Wählen Sie {6}, um " +"abzubrechen und weiterzuarbeiten." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Konflikte gefunden" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Hochladen fehlgeschlagen, da der Server eine neuere " +"Version
von einem Ihrer Knoten, Wege oder Relationen hat.

Wählen " +"Sie {0}, um den kompletten lokalen Datensatz mit dem Server " +"zu synchronisieren.
Wählen Sie {1}, um abzubrechen und " +"weiterzuarbeiten." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"Hochladen fehlgeschlagen, da der " +"verwendete
Änderungssatz {0} bereits am {1} geschlossen wurde.
Bitte " +"in einen neuen oder in einen vorhandenen, offenen Änderungssatz hochladen." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Änderungssatz geschlossen" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "Bereinigen von Konflikten vorbereiten" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "Klicken, um alle Wege mit dem Knoten {0} zu laden" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "Klicken, um abzubrechen und das Editieren der Karte wiederaufzunehmen" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" +"Hochladen ist fehlgeschlagen, weil der zu löschende " +"Knoten {0} noch im Weg {1} verwendet wird.

Klicken Sie {2}, um alle Wege mit dem Knoten {0} zu laden.
Falls nötig wird JOSM " +"Konflikte erstellen. Sie können diese anschließend im " +"Konfliktbearbeitungsdialog bereinigen." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "Ein Knoten wird noch benutzt" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" +"Warnung: die Fehlermeldung ''{0}'' stimmt nicht mit einem erwarteten Muster " +"überein" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Ein kurzer Kommentar über die hochzuladenden Änderungen:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" +"Bitte einen Kommentar für den Änderungssatz eingeben. (mind. 3 Zeichen)" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -8075,5 +8179,42 @@ msgstr "Kein offener Änderungssatz" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Neuen Änderungssatz öffnen" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "Einen neuen Änderungssatz öffnen und beim nächsten Hochladen verwenden" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Änderungssatz aktualisieren..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Daten in einen vorhandenen, offenen Änderungssatz hochladen" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "Änderungssatz nach dem Hochladen schließen" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" +"Auswählen, um den Änderungssatz nach dem nächsten Hochladen zu schließen" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "Liste Ihrer offenen Änderungssätze vom Server laden" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "Ausgewählten offenen Änderungssatz schließen" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" @@ -8081,35 +8222,112 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "Änderungssätze öffnen" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Änderungssätze schließen" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "Ausgewählten offenen Änderungssatz schließen" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "Schließen von Änderungssätzen abbrechen" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Änderungssatz schließen" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "Änderungssatz {0} schließen" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +#, fuzzy +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" +"Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " +"Fehlermeldung ist: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Benutzername und Passwort (unverschlüsselt) speichern" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Bitte einen Benutzernamen angeben" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Bitte Stichworte für die GPS-Spur angeben." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Leichtathletik" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Relation ändern" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "Auswahldialog für Datei öffnen" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "Dateinamen wählen" @@ -8182,17 +8400,17 @@ msgstr "Ebene in \"{0}\" speichern..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "Ungespeicherte Änderungen - Vor dem Beenden speichern/hochladen?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "Ungespeicherte Änderungen - Vor dem Löschen speichern/hochladen?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "Veränderte Ebenen hochladen und speichern..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -8209,9 +8427,9 @@ "verwerfen Sie die Änderungen.
Ebenen mit Konflikten:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "Ungespeicherte Daten und Konflikte" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -8231,9 +8449,9 @@ "Änderungen.
Ebenen ohne verknüpfte Dateien:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "Ungespeicherte Daten und fehlende Dateiverknüpfung" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -8254,35 +8472,35 @@ "Änderungen.
Ebenen mit schreibgeschützten Dateien:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "Ungespeicherte Daten schreibgeschützter Dateien" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "Diesen Dialog schließen und Bearbeitung in JOSM fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Verwerfen und Beenden" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" "JOSM ohne Speichern verlassen. Ungespeicherte Änderungen gehen verloren." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "Verwerfen und Löschen" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" "Ebene ohne Speichern löschen. Ungespeicherte Änderungen gehen verloren." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "Speichern/Hochladen und Beenden" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" @@ -8290,9 +8508,9 @@ "und/oder gespeichert." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "Speichern/Hochladen und Löschen" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" @@ -8300,10 +8518,10 @@ "nicht verloren." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "Ebene \"{0}\" für Hochladen vorbereiten..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -8313,5 +8531,5 @@ "Daten
wurde abgebrochen oder ist fehlgeschlagen." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "Unvollständiges Hochladen und/oder Speichern" @@ -8384,13 +8602,29 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Hochladen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Objekte aktualisieren" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Einstellungen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" @@ -8398,28 +8632,370 @@ "Änderungssatz verwendet wird" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "Merkmale des neuen Änderungssatzes" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "Merkmale im Änderungssatz nutzen, zu dem Hochgeladen wird" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "Einen neuen Änderungssatz öffnen und beim nächsten Hochladen verwenden" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "fortgeschritten" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Verfügbare Plugins bearbeiten." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Daten für Ebene \"{0}\" hochladen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Änderungen hochladen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "Geänderte Objekte hochladen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Bitte gib einen Kommentar für den Änderungssatz ein. (mind. 3 Zeichen)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "Ungültiger Kommentar" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "Bitte gib zuerst eine zulässige Blockgröße an." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "Ungültge Blockgröße" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "Hochladen abbrechend und Bearbeitung fortsetzen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Merkmale für Änderungssatz {0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" +"WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe " +"dieses Objekt und fahre mit dem Hochladen fort." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "Objekte zum Hochladen vorbereiten..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, fuzzy, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +"Bitte bestätigen Sie, dass {0} Objekte aus " +"{1} Relationen entfernt werden sollen." +msgstr[1] "" +"Bitte bestätigen Sie, dass {0} Objekte aus " +"{1} Relationen entfernt werden sollen." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Daten für Ebene \"{0}\" hochladen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "Mit Hochladen fortfahren" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +#, fuzzy +msgid "Click to return to the Upload Dialog" +msgstr "Klicken, um den Dialog zu schließen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Über" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Klicken, um das Vereinigen abzubrechen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Objekte zum Hochladen auswählen" +msgstr[1] "Objekte zum Hochladen auswählen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Informationen zum Änderungssatz" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe " +"dieses Objekt und fahre mit dem Hochladen fort." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" +"Das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe dieses " +"Objekt beim Hochladen." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "Übertrage {0} Objekte zum Server ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" +"Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die " +"Fehlermeldung war: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" +"Markiere die modifizierten Objekte aus der aktuellen Auswahl, die zum Server hochgeladen werden sollen. " + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" +"Markiere lokal gelöschte Objekte, die auf dem Server " +"gelöscht werden sollen." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "Objekte zum Hochladen auswählen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "Hochladen abbrechen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" +"Warnung: unerwarteter Wert für Schlüssel ''{0}'' in den Einstellungen, " +"erhielt ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Bitte wählen Sie die zu löschende Zeile." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "Daten in einer Anfrage hochladen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "Objekte in mehreren Paketen hochladen. Paketgröße: " + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "Jedes Objekt einzeln hochladen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "Einen neuen Änderungssatz öffnen und beim nächsten Hochladen verwenden" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "(1 Anfrage)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "(Anzahl der Anfragen unbekannt)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "({0} Anfrage)" +msgstr[1] "({0} Anfragen)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "Ungültge Blockgröße <= 0. Bitter gib eine Ganzahl > 1 ein." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "Bitter gib eine Ganzahl > 1 ein." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "Der Wert \"{0}\" ist keine Zahl. Bitte gib eine Ganzzahl größer 1 ein." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Neue Objekte:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Geänderte Objekte:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Zu löschende Objekte:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8428,5 +9004,5 @@ msgstr[1] "{0} hinzugefügte Objekte:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8435,5 +9011,5 @@ msgstr[1] "{0} zu bearbeitende Objekte:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8442,220 +9018,37 @@ msgstr[1] "{0} zu löschende Objekte:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Änderungen hochladen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "Geänderte Objekte hochladen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "Bitte gib einen Kommentar für den Änderungssatz ein. (mind. 3 Zeichen)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "Ungültiger Kommentar" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Bitte eine gültige Nummer für die Endnummer eingeben" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "Hochladen abbrechend und Bearbeitung fortsetzen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Ein kurzer Kommentar über die hochzuladenden Änderungen:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" -"Bitte einen Kommentar für den Änderungssatz eingeben. (mind. 3 Zeichen)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "Neuen Änderungssatz öffnen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "Einen neuen Änderungssatz öffnen und beim nächsten Hochladen verwenden" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "Offenen Änderungssatz verwenden" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Daten in einen vorhandenen, offenen Änderungssatz hochladen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "Änderungssatz nach dem Hochladen schließen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" -"Auswählen, um den Änderungssatz nach dem nächsten Hochladen zu schließen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Merkmale für Änderungssatz {0}" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "Liste Ihrer offenen Änderungssätze vom Server laden" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "Ausgewählten offenen Änderungssatz schließen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "ID > 0 für den Änderungssatz erwartet. Wert {0} erhalten." - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe " -"dieses Objekt und fahre mit dem Hochladen fort." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "Objekte zum Hochladen vorbereiten..." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" -"Markiere die modifizierten Objekte aus der aktuellen Auswahl, die zum Server hochgeladen werden sollen. " - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" -"Markiere lokal gelöschte Objekte, die auf dem Server " -"gelöscht werden sollen." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "Objekte zum Hochladen auswählen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "Hochladen abbrechen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "Mit Hochladen fortfahren" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "Achtung: Fehler beim speichern der Voreinstellungen in \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Alle Änderungen in einer Anfrage hochladen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "Fehlerhafte Anfrage" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} Meter" -msgstr[1] "{0} Meter" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Bitte einen Filterbegriff eingeben:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, fuzzy, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" -"Datei \"{0}\" kann nicht geschrieben werden. Bitte wählen Sie einen anderen " -"Dateinamen." - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "GPS-Punkt" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Linienaussehen anpassen" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Globale Einstellungen verwenden." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Linien zwischen Punkten dieser Ebene zeichnen." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Linienaussehen wählen" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8663,5 +9056,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8670,5 +9063,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8756,5 +9149,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Beschreibung" @@ -8786,10 +9179,10 @@ msgstr[1] "{0} Wegpunkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Zur Daten-Ebene konvertieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8799,12 +9192,12 @@ "
Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8813,29 +9206,29 @@ msgstr "Konvertiert von: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "OSM-Daten entlang der GPS-Spur herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Alles im Bereich herunterladen:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} Meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Maximalgebiet je Anfrage:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8846,5 +9239,5 @@ "fortfahren?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -8852,5 +9245,5 @@ "werden kann." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8860,5 +9253,5 @@ "wurden ignoriert oder an den Anfang verschoben." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8868,24 +9261,24 @@ "der GPS-Spur entfernt waren, wurden ignoriert." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datenebene {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "Außerhalb des heruntergeladenen Bereichs" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" "Warnung: Das Vermischen von 0.6- und 0.5-Daten resultiert in Version 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8894,5 +9287,5 @@ msgstr[1] "{0} Konflikte wurden entdeckt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8912,5 +9305,5 @@ "dem Server gelöscht wurden." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8927,11 +9320,11 @@ "Dialog und lösen Sie sie manuell." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "Diesen Dialog schließen und Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8940,36 +9333,36 @@ msgstr[1] "{0} gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} besteht aus:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "nicht angegeben" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "API-Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Zu GPX-Ebene konvertieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "Datensatzkonsistenzprüfung" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "Keine Probleme gefunden" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "Folgende Probleme gefunden:" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8979,5 +9372,5 @@ "
Informationen zum Hochladen von Tracks finden Sie hier:" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8986,5 +9379,5 @@ msgstr[1] "GPS-Spuren" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8992,5 +9385,5 @@ msgstr[1] "Punkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8999,5 +9392,5 @@ msgstr[1] "Eine GPS-Spur mit {0} Punkten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -9006,5 +9399,5 @@ msgstr[1] "{0} besteht aus {1} GPS-Spuren" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -9013,24 +9406,24 @@ msgstr[1] "{0} Punkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX-Dateien (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Datei {0} ist unter dem Namen \"{1}\" bereits geladen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Fehler beim Einlesen von {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Kann \"{0}\" nicht lesen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -9042,34 +9435,34 @@ "dem Foto und wählen eine Zeitzone

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Fotozeit (aus EXIF):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "GPS-Zeit (aus obigem Photo): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Ich bin in der Zeitzone von: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Kein Datum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Ein anderes Foto öffnen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Zeit von Foto und GPS-Empfänger synchronisieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -9079,155 +9472,117 @@ "Bitte verwenden Sie das geforderte Format" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Ungültiges Datum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPS-Spur: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Eine andere GPS-Spur laden" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Automatisch ermitteln" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Position aktualisieren für: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Zeitzone: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Offset:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Ich kann ein Bild meines GPS-Empfängers machen.
Ist das hilfreich?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Position aktualisieren für: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alle Bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Bilder ohne EXIF-Position" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Noch nicht referenzierte Bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Nichts ausgewählt!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "{0} von {1} Bildern mit GPS-Spur synchronisiert." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Bilder mit GPS-Spur korrelieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Korrelieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Automatisch ermitteln" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Wählen Sie eine GPS-Spur" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Keine GPS-Spur gewählt" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Fehler beim Lesen der Zeitzone.\n" -"Erwartetes Format: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 msgid "Invalid timezone" msgstr "Ungültige Zeitzone" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Fehler beim Einlesen des Offsets.\n" -"Erwartetes Format: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 msgid "Invalid offset" msgstr "Ungültiger Offset" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "{0} Treffer für {1} in GPS-Spur {2} gefunden" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPS-Spur geladen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Die gewählten Bilder enthalten keine Zeitinformation." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Bilder enthalten keine Zeitinformation" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"Die gewählte GPS-Spur enthält keine Zeitstempel. Bitte wählen Sie eine " -"andere." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPS-Spur enthält keine Zeitinformationen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Abzeichnen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 #, java-format msgid "Timezone: {0}" msgstr "Zeitzone: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 #, java-format msgid "Minutes: {0}" msgstr "Minuten: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 #, java-format msgid "Seconds: {0}" msgstr "Sekunden: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "{0} von {1} Bildern mit GPS-Spur synchronisiert." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" msgstr "(Zeitdifferenz von {0} Tagen)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Offset zwischen GPS-Spur und Bildern: {0}m {1}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9238,68 +9593,109 @@ "synchonisieren." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 msgid "Matching photos to track failed" msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 msgid "Adjust timezone and offset" msgstr "Zeitzone und Offset anpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standardwerte" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "Die gewählten Bilder enthalten keine Zeitinformation." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Bilder enthalten keine Zeitinformation" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"Die gewählte GPS-Spur enthält keine Zeitstempel. Bitte wählen Sie eine " +"andere." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPS-Spur enthält keine Zeitinformationen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 +msgid "You should select a GPX track" +msgstr "Wählen Sie eine GPS-Spur" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 +msgid "No selected GPX track" +msgstr "Keine GPS-Spur gewählt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Fehler beim Lesen der Zeitzone.\n" +"Erwartetes Format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Fehler beim Einlesen des Offsets.\n" +"Erwartetes Format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "GPS-Positionen aus EXIF-Daten extrahieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Verzeichnisuntersuchen starten" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "Eine der ausgewählten Dateien war nicht vorhanden." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Photos lesen..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Einlesen {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Kann generischen Pfad für Verzeichnis{0} nicht bestimmen\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Verzeichnis {0} untersuchen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Leere Datei im Verzeichnis {0} gefunden\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Georeferenzierte Bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Mit GPX korrelieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -9307,52 +9703,100 @@ msgstr[1] "Bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} wurden als GPS-markiert erkannt." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Immer verschieben und diese Meldung nicht mehr anzeigen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Die eingegebene Zeit konnte nicht eingelesen werden." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Kein Bild" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "{0} herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Fehler bei Datei {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Georeferenzierte Bilder anzeigen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "Stelle georefernzierte Bilder dar" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Vorheriges" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Vorheriges Bild" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Webseite: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Photo aus Ebene entfernen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Aus der Relation entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Nächstes" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Nächstes Bild" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Anzeige zentrieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Passend zoomen und 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -9363,5 +9807,5 @@ "Höhe: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9468,4 +9912,12 @@ msgid "Error displaying URL" msgstr "Fehler beim Anzeigen der URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9696,7 +10148,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Alle" @@ -9766,6 +10217,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Fahrrad" @@ -10171,31 +10622,95 @@ "benutzt." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Proxy-Server verwenden" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonym" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Jugendherberge" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Schnittstelle:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Passwort" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Proxy-Einstellungen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Proxyserver-Hostname" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Proxyserver-Port" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Proxyserver-Nutzername" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Proxyserver-Passwort" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "Die Basis-URL des OSM Servers (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "Benutzername (E-Mail) für den OSM-Server." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Passwort für den OSM-Server. Leer, wenn kein Passwort gespeichert werden " +"soll." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Server Basis-URL" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "OSM-Benutzername (E-Mail)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM-Passwort" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei " +"gespeichert.
Das Passwort wird im Klartext (in der URL) zum Server " +"übertragen.
Benutzen Sie kein wertvolles Passwort." #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10502,5 +11017,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10510,13 +11025,13 @@ msgstr[1] "Entferne alte Schlüssel von bis zu {0} Objekten" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "Neues Tag hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "Auswahl in der Merkmalstabelle löschen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10524,18 +11039,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Optionale Attribute:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "geschlossener Weg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Unbekannter Typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10546,16 +11061,16 @@ msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Fehler beim Einlesen von {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Elemente des Typs {0} werden unterstützt." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10564,18 +11079,18 @@ msgstr[1] "Ändere {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Nichts ausgewählt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Auswahl unpassend!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Vorlage anwenden" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Einstellungen ändern" @@ -10604,4 +11119,13 @@ msgstr "Punkte {0} bis {1} werden heruntergeladen..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +#, fuzzy +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" +"Ungültiger Wert \"{2}\" für das Attribut ''{0}'' des XML-Elements ''{1}''." + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10619,12 +11143,72 @@ "Änderungssatzes, Wert ist ''{0}''." -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, vielleicht fehlende Merkmale." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Daten werden vorbereitet...." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, fuzzy, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" +"Unerwartetes Format der neuen Version des geänderten Objekts {0}. Wert ist " +"\"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, fuzzy, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" +"Warnung: unerwarteter Wert für Schlüssel ''{0}'' in den Einstellungen, " +"erhielt ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +#, fuzzy +msgid "Parsing response from server..." +msgstr "Suche nach Namen ..." + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "unerwartete Spaltenzahl {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10727,10 +11311,10 @@ msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "Unbekannter Modus {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -10739,6 +11323,6 @@ "unklar." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10748,40 +11332,40 @@ msgstr "OSM-Daten herunterladen..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Knoten mit der ID {0} von \"{1}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Weg mit der ID {0} von \"{1}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Relation mit der ID {0} von \"{1}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "ID \"{0}\" ausgelassen wegen Serverantwort Nummer 404" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Mehrere Knoten von \"{0}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Mehrere Wege von \"{0}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Mehrere Relationen von \"{0}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10789,10 +11373,10 @@ msgstr "Serverantwort Nummer 404, versuche Einzelanfragen für jedes Element" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Relation ''{0}'' herunterladen" -msgstr[1] "Relation ''{0}'' herunterladen" +msgstr[0] "{0} Objekt aus \"{1}\" herunterladen" +msgstr[1] "{0} Objekte aus \"{1}\" herunterladen" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10829,34 +11413,34 @@ msgstr "NMEA-Einlesen fehlgeschlagen!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, fuzzy, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." msgstr "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "Diese JOSM-Version ist mit dem eingestellten Server inkompatibel." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"JOSM unterstützt die Protokoll-Versionen 0.5 und 0.6, während der Server {0} " -"bis {1} unterstützt." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +"Es unterstützt die Protokollversion 0.6, während der Server besagt, dass nur " +"die Versionen {0} bis {1} unterstützt werden." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Kommunikation mit {0} mittels Protokollversion {1} etabliert." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10866,62 +11450,73 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "Änderungssatz erstellen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Änderungssatz {0} erfolgreich geöffnet" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "ID > 0 für den Änderungssatz erwartet. Wert {0} erhalten." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Änderungssatz aktualisieren..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "Änderungssatz {0} aktualisieren..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Änderungssatz schließen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Kein Änderungssatz zum Hochladen vorhanden" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Daten vorbereiten..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Daten hochladen..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Übertragung in einer Anfrage wird gestartet ..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Übertrage {0} Objekte zum Server ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "Warte 10 Sekunden... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Starte Versuch {0} von {1} in {2} Sekunden..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "OK - erneuter Versuch." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starte Wiederholung {0} von {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" "Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." @@ -10930,5 +11525,5 @@ "ist {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10957,4 +11552,14 @@ msgid "Invalid bz2 file." msgstr "Ungültige bz2-Datei." + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10965,5 +11570,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10993,5 +11598,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -11000,5 +11605,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -11011,5 +11616,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -11020,62 +11625,6 @@ msgstr "Liste der Änderungssätze einlesen..." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Passwort oder Benutzername falsch." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Benutzername und Passwort (unverschlüsselt) speichern" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Passwort eingeben" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Anmelden" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "Die Basis-URL des OSM Servers (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "Benutzername (E-Mail) für den OSM-Server." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Passwort für den OSM-Server. Leer, wenn kein Passwort gespeichert werden " -"soll." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Server Basis-URL" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "OSM-Benutzername (E-Mail)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM-Passwort" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei " -"gespeichert.
Das Passwort wird im Klartext (in der URL) zum Server " -"übertragen.
Benutzen Sie kein wertvolles Passwort." - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -11179,5 +11728,12 @@ msgstr "Die Datei \"{0}\" existiert nicht" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -11188,19 +11744,19 @@ "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "Das XML-Element ist kein unmittelbares Kindelement von ." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Fehlendes obligatorisches Attribut \"{0}\" auf des Wegs {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "Ungültiger Wert \"{0}\" des Attributs \"ref\" im Element ." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" @@ -11208,10 +11764,10 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" @@ -11219,10 +11775,10 @@ "Ungültiger Wert \"{1}\" für Attribut \"ref\" bei Element der Relation {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Fehlendes Attributs \"type\" bei Mitglied {0} der Relation {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -11232,9 +11788,9 @@ "{1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Unvollständige -Beschreibung mit ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." @@ -11243,10 +11799,10 @@ "Dieses wird ignoriert." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Illegales Objekt mit id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -11258,8 +11814,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -11272,25 +11828,42 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "Das Attribut ''version'' für das OSM Element mit der ID {0} fehlt" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" +"Ungültiger Wert \"{2}\" für das Attribut ''{0}'' des XML-Elements ''{1}''." + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "Ungültiger Wert für Attribut \"uid\". Erhaltener Wert \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "Fehlendes erforderliches Attribut \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -11300,5 +11873,5 @@ "mit externer ID ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -11309,5 +11882,5 @@ "einer seiner {1} Knoten in den geladenen Daten fehlt." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -11317,5 +11890,5 @@ "externer ID ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -11326,13 +11899,13 @@ "externer ID ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "OSM-Daten werden vorbereitet...." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "OSM-Daten einlesen..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "Datensatz wird vorbereitet ..." @@ -11355,20 +11928,32 @@ msgstr "Lade referenzierende Relationen herunter..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "Änderungssetze einlesen..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "Änderungssätze herunterladen..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "Änderungssatz {0} einlesen..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." +msgstr "Änderungssatz {0} herunterladen..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Änderungssätze herunterladen..." +msgstr[1] "Änderungssätze herunterladen..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." msgstr "Änderungssatz {0} herunterladen..." @@ -11389,7 +11974,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "Parameter \"index\" hat unerwarteten Wert {0}." +msgstr "Anstatt {1} wird ein Wert > 0 für den Parameter \"{0}\" erwartet." #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -11398,9 +11983,5 @@ msgstr "Verbindung zu API {0} konnte nicht geöffnet werden" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "Fehler: Anmeldedaten konnten nicht zur Verbindung hinzugefügt werden." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11454,21 +12035,25 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "Parameter \"index\" hat unerwarteten Wert {0}." +msgstr "Anstatt {1} wird ein Wert > 0 für den Parameter \"{0}\" erwartet." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 -#, fuzzy msgid "Starting to upload in chunks..." -msgstr "Übertragung in einer Anfrage wird gestartet ..." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 -#, fuzzy, java-format +msgstr "Hochladen in Blöcken wird gestartet..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format msgid "({0}/{1}) Uploading {2} objects..." -msgstr "Übertrage {0} Objekte zum Server ..." +msgstr "({0}/{1}) {2} Objekte hochladen..." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Übertragung zum Server ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Gelöschte oder verschobene Objekte" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11510,12 +12095,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Plugin {0} herunterladen..." +msgstr "Altes Plugin {0} entfernen" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 #, java-format msgid "Delete old plugin file {0}" -msgstr "" +msgstr "Alte Plugindatei {0} entfernen" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11544,5 +12129,5 @@ #, java-format msgid "Plugin {0} is no longer necessary and has been deactivated." -msgstr "" +msgstr "Plugin {0} wird nicht mehr benötigt und wurde deaktiviert." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84 @@ -11668,9 +12253,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "keine Beschreibung verfügbar" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Mehr Details" @@ -11812,4 +12397,19 @@ msgid "You've encountered a bug in JOSM" msgstr "Sie haben einen Fehler in JOSM gefunden" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, fuzzy, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "Anstatt {1} wird ein Wert > 0 für den Parameter \"{0}\" erwartet." + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "Anstatt {1} wird ein Wert > 0 für den Parameter \"{0}\" erwartet." + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 @@ -12172,6 +12772,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "GPS-Spuren hochladen" @@ -12258,5 +12858,5 @@ msgstr "GPS-Spur hochladen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "GPS-Spuren zu openstreetmap.org hochladen" @@ -12267,5 +12867,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Adressinterpolation" @@ -12280,11 +12880,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "ungerade" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "gerade" @@ -12295,24 +12892,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Nummer" +msgstr "Numerisch" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "Natur" +msgstr "Vor Ort bestätigt" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "Örtlichkeit" +msgstr "Mit Wissen geschätzt" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Vermietung" +msgstr "Grob Geschätzt" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -12330,7 +12923,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "Inneres Segment" +msgstr "Schrittweite:" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -12344,9 +12936,9 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226 msgid "Accuracy:" -msgstr "" +msgstr "Genauigkeit:" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238 msgid "Convert way to individual house numbers." -msgstr "" +msgstr "Weg in einzelne Hausnummern umwandeln." #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307 @@ -12400,7 +12992,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 -#, fuzzy msgid "Expected valid number for address increment" -msgstr "Ungerade Hausnummern erwartet" +msgstr "Erwartete gültige Zahl für Adresserhöhung" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 @@ -12451,5 +13042,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "Feuille auswählen" @@ -12515,21 +13106,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Wähle eine Kommune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Wähle aus..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Kataster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Automatische Quellenangabe" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12542,13 +13133,13 @@ "Wollen Sie wieder zum Bilder holen nutzen?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "Tastaturkürzel wiederherstellen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM wird zum Aktivieren der Änderung beendet." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12575,17 +13166,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "Bildbeschneidung während der Georeferenzierung deaktivieren" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Automatischen Zwischenspeicher aktivieren." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Max. Speichergröße (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12603,19 +13194,19 @@ "dieses Plugins erstellt wurden, hochladen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "Französisches Kataster-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" "Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Quelle" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12625,5 +13216,5 @@ "Hintergrundfarbe ersetzen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12633,9 +13224,9 @@ "Nützlich für Texte auf dunklen Hintergründen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Stapeln mehrerer Schichten erlauben" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -12643,45 +13234,42 @@ "durchsichtig." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Ein Rechteck um die vom WMS-Server heruntergeladenen Daten zeichnen" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "Multiplikator für Vektordaten:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Kleinere Bilder holen (höhere Qualität, aber mehr Speicherbedarf)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Feste Quadratgröße (Standard ist 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Feste Größe (von 25 bis 1000 Meter)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "Multiplikator für Pixelgrafiken:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "Anzeige der Querstücke:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Automatisches \"source\"-Merkmal:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Merkmal \"source=...\" zu Elementen hinzufügen?" @@ -12904,5 +13492,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Ort" @@ -13107,5 +13695,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Keine Daten geladen." @@ -13127,9 +13715,9 @@ msgstr "In GPX-Ebene mit anonymer Zeit konvertieren" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "GPS-Spuren ändern" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "GPX-Ändern" @@ -13518,7 +14106,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "Wasser" @@ -13680,19 +14268,19 @@ msgstr "Kann Bild nicht laden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Verbinden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Verbunden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Nicht verbunden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Verbindung fehlgeschlagen" @@ -13731,11 +14319,11 @@ msgstr "Live GPS-Ebene" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "GPS-Spur aufzeichnen" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" @@ -13743,22 +14331,22 @@ "anzeigen." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Einmalig zentrieren" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Die LiveGPS-Ebene auf die aktuelle Position zentrieren." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Automatisch zentrieren" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Die LiveGPS-Ebene kontinuierlich auf die aktuelle Position zentrieren." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "Live GPS" @@ -13809,9 +14397,9 @@ msgstr "Kann nicht außerhalb der Welt zeichnen." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "Messmodus" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Messungen" @@ -13853,5 +14441,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13862,5 +14450,5 @@ msgstr "Multipolygon erstellen." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" @@ -13868,9 +14456,9 @@ "enthalten." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "Ein Multipolygon darf nur aus geschlossenen Wegen bestehen." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "Sie müssen mindestens zwei Wege auswählen." @@ -14027,5 +14615,5 @@ msgstr "Firefox-Programm" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "PicLayer" @@ -14122,5 +14710,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -14196,41 +14784,41 @@ msgstr "Gewichtswerte eingeben" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Karte" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "Autom. Zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Lade Kachel" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "Kachelinformationen anzeigen" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Alle Kacheln laden" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Zoom erhöhen" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Zoom reduzieren" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "An Kachelgröße anpassen" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "Kachel-Zwischenspeicher leeren" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "Bild " @@ -14403,4 +14991,43 @@ "Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "gerade" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Niedrigste Nummer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Höchste Nummer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Straßen" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Höchste Nummer" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -14419,42 +15046,20 @@ msgstr "Gebäudeteilung umkehren" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Gebäude abteilen" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Individuelle Gebäude aus einem langen Gebäude erstellen." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Einen geschlossenen Weg mit vier Knotenpunkten auswählen." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Abteilen" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Höchste Nummer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Niedrigste Nummer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolation" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Straßenname" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Optional" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14469,5 +15074,5 @@ msgstr "Keine Fehler gefunden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Raster" @@ -15140,38 +15745,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "Gebäude" @@ -15185,5 +15760,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "Fläche" @@ -15310,10 +15885,10 @@ "lesen" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Walking Papers: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15603,5 +16178,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" -msgstr "WMS_Lesezeichen erstellen" +msgstr "WMS-Lesezeichen erstellen" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -15722,4 +16297,7 @@ "option to automatically generate individual house number nodes from a Way." msgstr "" +"Fasse die Eingabe geläufiger Addressinterpolationen in einem einzigen Dialog " +"zusammen und generiere individuelle Hausnummern auf Konten entlang eines " +"Wegs." #. Plugin cadastre-fr @@ -16094,6 +16672,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Referenz" @@ -16539,5 +17117,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Breite (Meter)" @@ -16655,5 +17233,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "Metall" @@ -16665,5 +17243,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "Holz" @@ -16921,4 +17499,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16950,8 +17531,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "ja" @@ -17099,9 +17682,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "nein" @@ -17346,5 +17930,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "Ortsstraße" @@ -17379,5 +17963,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "Service" @@ -17411,6 +17995,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "Baustelle" @@ -17460,5 +18044,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "Kreisverkehr" @@ -17646,6 +18230,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Wanderweg" @@ -17766,5 +18350,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17790,4 +18373,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17797,15 +18381,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Betreiber" @@ -18017,7 +18601,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Höhe" @@ -18436,5 +19020,5 @@ msgstr "Moor" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -18444,5 +19028,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "Marsch" @@ -18968,32 +19552,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Öffnungszeiten" @@ -19052,91 +19636,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "24/7" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "Mo-Fr 08:30-20:00" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00" @@ -19151,5 +19735,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -19168,7 +19752,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Referenznummer" @@ -19184,5 +19768,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "Tiefgarage" @@ -19195,6 +19779,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Gebühr" @@ -19233,22 +19817,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Geschäft" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Autohaus bearbeiten" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Werkstatt" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Autowerkstatt bearbeiten" @@ -19256,5 +19828,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Vermietung" @@ -19263,10 +19835,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Autovermietung bearbeiten" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Autotausch / Car Sharing" @@ -19274,5 +19846,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Autotausch (Car Sharing) bearbeiten" @@ -19280,10 +19852,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Fahrradparkplatz bearbeiten" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Kapazität" @@ -19292,22 +19864,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Fahrradleihstelle bearbeiten" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Fahrradladen bearbeiten" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Öffentliche Verkehrsmittel" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -19317,5 +19882,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -19323,5 +19888,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Referenz" @@ -19329,5 +19894,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Eisenbahnhaltepunkt" @@ -19335,5 +19900,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Haltepunkt bearbeiten" @@ -19341,5 +19906,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Straßenbahnhaltestelle" @@ -19348,5 +19913,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Straßenbahnhaltestelle bearbeiten" @@ -19354,5 +19919,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Bahnsteig" @@ -19361,5 +19926,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Bahnsteig bearbeiten" @@ -19371,5 +19936,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Referenznummer (Steig)" @@ -19377,10 +19942,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Fläche" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "U-Bahn-Eingang" @@ -19389,10 +19954,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "U-Bahn-Eingang bearbeiten" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Rollstuhl" @@ -19401,5 +19966,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Busbahnhof" @@ -19408,5 +19973,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Busbahnhof bearbeiten" @@ -19414,5 +19979,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Bushaltestelle" @@ -19422,5 +19987,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Bushaltestelle bearbeiten" @@ -19429,17 +19994,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Schutzraum" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Bank" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Bussteig" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Bussteig bearbeiten" @@ -19447,5 +20020,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -19453,5 +20026,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Taxihaltepunkt bearbeiten" @@ -19459,5 +20032,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Flughafen" @@ -19465,15 +20038,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Flughafen bearbeiten" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -19481,10 +20054,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Reisen" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Unterkunft" @@ -19496,5 +20069,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -19503,15 +20076,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Hotel bearbeiten" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Sterne" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motel" @@ -19519,20 +20092,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Motel bearbeiten" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Gästehaus (Bed & Breakfast)" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Gästehaus bearbeiten" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Ferienhaus" @@ -19540,10 +20113,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Ferienhaus bearbeiten" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Jugendherberge" @@ -19551,30 +20124,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Jugendherberge bearbeiten" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Alpenhütte" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Alpenhütte bearbeiten" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Wohnwagenstellplätze" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Wohnwagenstellplätze bearbeiten" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Campingplatz" @@ -19582,10 +20155,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Campingplatz bearbeiten" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Essen & Trinken" @@ -19596,5 +20169,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -19602,5 +20175,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Restaurant bearbeiten" @@ -19608,5 +20181,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Küche" @@ -19614,61 +20187,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italienisch" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "chinesisch" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "Pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "Hamburger" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "griechisch" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "deutsch" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indisch" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "regional" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "Döner" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "türkisch" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asiatisch" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thailändisch" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexikanisch" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japanisch" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Imbiss (Fast Food)" @@ -19676,9 +20249,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Imbiss (Fast Food-Restaurant) bearbeiten" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Café" @@ -19686,9 +20259,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Café bearbeiten" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Kneipe" @@ -19696,18 +20269,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Kneipe bearbeiten" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Biergarten bearbeiten" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Bar" @@ -19715,9 +20288,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Bar bearbeiten" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Nachtclub" @@ -19725,24 +20298,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Nachtclub bearbeiten" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Tourismus" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Attraktion" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Attraktion bearbeiten" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museum" @@ -19750,9 +20323,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Museum bearbeiten" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -19761,9 +20334,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Zoo bearbeiten" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Aussichtspunkt" @@ -19771,24 +20344,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Aussichtspunkt bearbeiten" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Aussichtsturm" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Themenpark" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Themenpark bearbeiten" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Kunstausstellung" @@ -19796,5 +20369,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Kunstausstellung bearbeiten" @@ -19802,19 +20375,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Informationsbüro" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Karte" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "Detailgrad" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "topograhisch" @@ -19852,5 +20425,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19858,28 +20431,28 @@ msgstr "Straße" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "schematisch" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "Kartenausschnitt" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "Örtlichkeit" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "Stadt" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "Region" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Nähere Beschreibung" @@ -19889,5 +20462,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "Dargestellte Routen für:" @@ -19895,6 +20468,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Radfahren" @@ -19902,5 +20475,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "Mountainbike fahren" @@ -19908,6 +20481,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Skifahren" @@ -19915,5 +20488,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "Reiten" @@ -19921,46 +20494,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "...andere mögliche Transportarten" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Informationstafel" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "Inhalt" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "Notiz" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "Geschichte" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "Natur" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "Wildtiere" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "Pflanzen" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "Wegweiser" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "Informationsterminal" @@ -19968,29 +20541,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "Nähere Beschreibung" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1769 msgid "Audioguide" msgstr "Audioguide" #. -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" msgstr "Audioguide per Handy?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 +#: build/trans_presets.java:1780 msgid "Phone number" msgstr "Telefonnummer" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Andere Informationspunkte" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Schutzraum bearbeiten" @@ -19998,25 +20571,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Feuerstelle" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Picknickplatz" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Picknickplatz bearbeiten" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Historische Stätten" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Burg / Schloß" @@ -20025,19 +20598,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Burg / Schloß bearbeiten" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruinen" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Ruinen bearbeiten" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Ausgrabungsstelle" @@ -20046,9 +20619,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Ausgrabungsstelle bearbeiten" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Schlachtfeld" @@ -20056,10 +20629,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Schlachtfeld bearbeiten" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "Paläontologische Stätte" @@ -20067,5 +20640,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "Paläontologische Stätte bearbeiten" @@ -20073,15 +20646,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Baudenkmal" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Baudenkmal bearbeiten" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Gedenkstätte" @@ -20089,55 +20662,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Gedenkstätte bearbeiten" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Wegkreuz" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Wegkreuz bearbeiten" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Bildstock" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Bildstock bearbeiten" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "Grenzstein" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "Grenzstein bearbeiten" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Freizeit" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Schwimmbad" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Schwimmbad bearbeiten" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Spielplatz" @@ -20145,35 +20718,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Spielplatz bearbeiten" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Angeln" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Angelplatz bearbeiten" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Sport" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Sporteinrichtungen" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Stadion bearbeiten" @@ -20187,6 +20760,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "Sportart wählen:" @@ -20578,30 +21151,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "Sport" @@ -20611,225 +21184,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "Mehrfachnutzung" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "Bogenschießen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "Leichtathletik" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "Australian Football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "Baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "Basketball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "Boule" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "Bowls" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "Kanu" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "Klettern" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "Kricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "Kricketnetze" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "Krocket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "Fahrradfahren" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "Hunderennen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "Reiten" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "American Football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "Golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "Gymnastik" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "Hockey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "Pferderennen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "Motorsport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "Pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "Schlagball (Racquet)" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "Rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "Schießen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "Skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "Eislaufen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "Skifahren" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "Fußball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "Schwimmen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "Tischtennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "Tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Sporthalle / Fitnesscenter" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Sporthalle / Fitnesscenter bearbeiten" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Spielfeld" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Spielfeld bearbeiten" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Rennbahn" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Rennbahn bearbeiten" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfanlage" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Golfanlage bearbeiten" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Minigolfplatz bearbeiten" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Mehrfachnutzung" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Mehrfach genutzten Sportplatz bearbeiten" @@ -20868,21 +21441,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "Typ" @@ -20921,203 +21494,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "Spielfeld" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "Sporthalle / Fitnesscenter" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "Stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "Weg" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "Bowling" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Bowlinghalle bearbeiten" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Leichtathletik" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Leichtathletikfeld bearbeiten" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Bogenschießen" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Bogenschießplatz bearbeiten" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Klettern" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Kletterbereich bearbeiten" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Kanufahren" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Kanufahrtstrecke bearbeiten" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Radsporthalle oder -kurs bearbeiten" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Hunderennen" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Trainingsplatz für Hunde bearbeiten" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Reitplatz" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Reitplatz bearbeiten" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Pferderennen" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Pferderennplatz bearbeiten" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gymnastik" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Gymnastikbereich bearbeiten" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Motorsport" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Motorsportplatz bearbeiten" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Eislaufen" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Eislaufbahn bearbeiten" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Skateboardplatz bearbeiten" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Schwimmen" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Schwimmbad bearbeiten" @@ -21125,56 +21698,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Skipiste bearbeiten" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Pistentyp" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "Abfahrt" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "Langlauf" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "Schneepark" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Schwierigkeit" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "Anfänger" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "einfach" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "mittelschwer" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "fortgeschritten" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "Experte" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "Freistil" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Schießen" @@ -21182,182 +21755,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Schießbahn bearbeiten" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Ballsport" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Fußball" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Fußballplatz bearbeiten" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "American Football" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "American Football-Platz bearbeiten" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Australian Football" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Australian Foootball-Platz bearbeiten" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Baseballplatz bearbeiten" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Basketballplatz bearbeiten" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golfplatz" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Golfplatz bearbeiten" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "Golfanlage" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Boule-Spielbereich bearbeiten" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Bowls" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Bowls-Spielfeld bearbeiten" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Kricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Kricketspielfeld bearbeiten" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Kricketnetze" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Kricketnetze bearbeiten" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Krocket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Krocketspielfeld bearbeiten" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Hockeyplatz bearbeiten" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Pelotaplatz bearbeiten" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Schlagball (Racquet)" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Schlagball (Racquet)-Platz bearbeiten" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Rugbyplatz bearbeiten" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Tischtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Tischtennisplatz bearbeiten" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Tennisplatz bearbeiten" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "Zivilisationsbauten" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Gebäude" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Gebäude" @@ -21365,5 +21938,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Öffentliches Gebäude" @@ -21371,10 +21944,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Öffentliches Gebäuden bearbeiten" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Rathaus" @@ -21382,10 +21955,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Rathaus bearbeiten" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Botschaft" @@ -21393,10 +21966,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Botschaft bearbeiten" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Gericht" @@ -21405,10 +21978,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Gericht bearbeiten" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Gefängnis" @@ -21417,10 +21990,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Gefängnis bearbeiten" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Polizei" @@ -21430,10 +22003,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Polizei bearbeiten" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Feuerwache" @@ -21442,10 +22015,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Feuerwache bearbeiten" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Post" @@ -21453,5 +22026,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Post bearbeiten" @@ -21459,15 +22032,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Kindergarten" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Kindergarten bearbeiten" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Schule" @@ -21475,10 +22048,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Schule bearbeiten" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Universität" @@ -21486,10 +22059,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Universität bearbeiten" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Hochschule" @@ -21497,5 +22070,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "College bearbeiten" @@ -21503,5 +22076,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Kino" @@ -21510,10 +22083,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Kino bearbeiten" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Bibliothek" @@ -21522,9 +22095,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Bibliothek bearbeiten" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Kulturzentrum" @@ -21532,10 +22105,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Kulturzentrum bearbeiten" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Theater" @@ -21544,10 +22117,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Theater bearbeiten" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Kirche" @@ -21557,5 +22130,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Kirche bearbeiten" @@ -21564,6 +22137,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religion" @@ -21572,66 +22145,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahaiistisch" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "buddhistisch" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "christlich" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hinduistisch" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jainistisch" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "jüdisch" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "moslemisch" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikhistisch" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spiritistisch" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoistisch" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "unitarisch" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrisch" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Konfession" @@ -21640,81 +22213,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglikanisch" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptistisch" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "katholisch" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangelikal" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "Zeugen Jehovas" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "lutherisch" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "methodistisch" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormonisch" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "Pfingstgemeinde" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbyterianisch" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestantisch" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "Quäker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "schiitisch" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunnitisch" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adressen" @@ -21723,5 +22296,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Adressinformationen bearbeiten" @@ -21729,5 +22302,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Hausnummer" @@ -21735,20 +22308,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Hausname" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Straßenname" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Ortsname" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Postleitzahl" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Länderkennung" @@ -21757,5 +22335,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Adressinterpolation bearbeiten" @@ -21763,61 +22341,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Nummernschema" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "ungerade" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "gerade" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "alphabetisch" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Zivilisationsbauten" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Fabrik" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Fabrik bearbeiten" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Turm" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Turm bearbeiten" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "Art des Turms" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "Kommunikation" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "Beobachtung" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "Höhe (in Meter)" @@ -21825,25 +22403,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Wasserturm" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Wasserturm bearbeiten" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gasometer" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Gasometer bearbeiten" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Leuchtturm" @@ -21851,10 +22429,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Leuchtturm bearbeiten" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Windmühle" @@ -21862,10 +22440,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Windmühle bearbeiten" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Pipeline" @@ -21874,37 +22452,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Pipeline bearbeiten" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "Öl" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "Gas" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "Abwasser" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "Wärme" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "Beliebige Substanz" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "Unter Wasser" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "oberirdisch" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Kläranlage" @@ -21914,10 +22492,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Kläranlage bearbeiten" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Stationärer Kran" @@ -21925,10 +22503,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Stationären Kran bearbeiten" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Bake" @@ -21936,10 +22514,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Bake bearbeiten" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Vermessungspunkt" @@ -21947,10 +22525,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Vermessungspunkt bearbeiten" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Überwachungskamera" @@ -21958,5 +22536,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Überwachungskamera bearbeiten" @@ -21964,5 +22542,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Stromgenerator" @@ -21972,35 +22550,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Stromgenerator bearbeiten" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "Wind" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "Wasser" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "Fossil" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "Nuklear" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "Kohle" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "Photovoltaik" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Umspannwerk" @@ -22009,10 +22587,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Umspannwerk bearbeiten" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Trafostation" @@ -22021,5 +22599,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Trafostation bearbeiten" @@ -22027,10 +22605,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Liniennummer" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Strommast" @@ -22041,23 +22619,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Strommast bearbeiten" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "Turm" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "Mast" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "Identifikation des Turms" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Stromleitung" @@ -22066,75 +22644,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Stromleitung bearbeiten" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "Art der Stromleitung" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "Freileitung (Starkstrom)" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "Freitleitung (Schwachstrom)" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Spannung" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "Anzahl Leitungen" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "Anzahl der Adern (besser: Leiter) je Stromkabel" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "einzeln" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "doppelt" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "dreifach" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "vierfach" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Einrichtungen" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Toiletten" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Kommentar" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Briefkasten" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefon" @@ -22143,5 +22721,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Telefon bearbeiten" @@ -22149,5 +22727,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Münzen" @@ -22155,5 +22733,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Scheine" @@ -22161,5 +22739,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Geld- oder Prepaidkarten" @@ -22167,5 +22745,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Konto- oder EC-Karten" @@ -22173,15 +22751,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kreditkarten" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefonkarten" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Recyclingstelle & -container" @@ -22190,5 +22768,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Recyclingstelle oder -container bearbeiten" @@ -22196,68 +22774,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batterien" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Dosen" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Kleidung" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Altmetall" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Bank" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "Lehne" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "Material" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "Stein" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "Kunststoff" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "Farbe" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "schwarz" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "braun" @@ -22328,39 +22901,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "grün" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "rot" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "blau" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "grau" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "weiß" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "Anzahl der Sitzplätze" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Jagdanstand" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Jagdanstand bearbeiten" @@ -22369,30 +22942,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Höhe" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "niedrig" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "halb" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "voll" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Versteck" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Schloß" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Springbrunnen" @@ -22401,10 +22974,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Springbrunnen bearbeiten" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Trinkwasser" @@ -22413,10 +22986,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Trinkwasserabgabe bearbeiten" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Babyklappe" @@ -22424,33 +22997,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Babyklappe bearbeiten" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Geschäfte" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Autohaus bearbeiten" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Fahrradladen bearbeiten" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarkt" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Supermarkt bearbeiten" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "Drogerie" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "Drogerie bearbeiten" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Tante-Emma-Laden" @@ -22458,9 +23055,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Tante-Emma-Laden bearbeiten" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosk" @@ -22468,27 +23065,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Kiosk bearbeiten" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "Buchhandlung" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "Buchhandlung bearbeiten" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Reisebüro" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Reisebüro bearbeiten" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Verkaufsautomat" @@ -22496,5 +23093,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Automaten bearbeiten" @@ -22502,88 +23099,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Automatenprodukte" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "Fahrscheine" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "Pläne des öffentlichen Nahverkehrs" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "Parkscheine" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "Essen" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "Getränke" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "Süßigkeiten" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "Zigaretten" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "Fotos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "Tiernahrung" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "Zeitungen" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "Spielzeug" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "Briefmarken" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-Karten" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "Telefonkarten" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "Karten/Belege" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "Kondome" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "Tampons" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "Hundekot-Tüten" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Kundenkarten" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Fleischer" @@ -22591,9 +23188,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Fleischer bearbeiten" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Bäcker" @@ -22601,9 +23198,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Bäcker bearbeiten" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Blumenladen" @@ -22611,18 +23208,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Blumenladen bearbeiten" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Bioladen" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Bioladen bearbeiten" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Spirituosen" @@ -22630,54 +23227,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Spirituosengeschäft bearbeiten" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Getränke" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Getränkeladen bearbeiten" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Computergeschäft bearbeiten" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Elektronikgeschäft" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Elektronikgeschäft bearbeiten" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Hifi-Geschäft bearbeiten" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Mobiliar" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Möbelgeschäft bearbeiten" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Gartenzentrum" @@ -22685,9 +23282,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Gartenzentrum bearbeiten" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Haushaltswaren" @@ -22695,9 +23292,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Haushaltswaren bearbeiten" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Heimwerkerbedarf" @@ -22705,54 +23302,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Geschäft für Heimwerkerbedarf bearbeiten" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Bürobedarf" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Bürobedarf bearbeiten" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Friseur" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Friseur bearbeiten" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Schuhe" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Schuhladen bearbeiten" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Spielzeug" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Spielzeuggeschäft bearbeiten" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Videoverleih" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Videogeschäft bearbeiten" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Chemische Reinigung" @@ -22760,9 +23357,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Chemische Reinigung bearbeiten" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Waschsalon" @@ -22770,9 +23367,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Waschsalon bearbeiten" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Camping (Outdoor)" @@ -22780,28 +23377,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Sportgeschäft bearbeiten" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Optiker" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Optiker bearbeiten" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Geld" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Bank" @@ -22809,14 +23406,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Bank bearbeiten" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Geldautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Wechselstube" @@ -22824,5 +23421,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Wechselstube bearbeiten" @@ -22830,15 +23427,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Geldautomat bearbeiten" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Gesundheit" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Arzt" @@ -22846,18 +23443,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Arzt bearbeiten" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Zahnarzt" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Zahnarzt bearbeiten" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Apotheke" @@ -22865,5 +23462,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Apotheke bearbeiten" @@ -22871,9 +23468,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Rezepteinlösung" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Krankenhaus" @@ -22881,10 +23478,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Krankenhaus bearbeiten" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Notfallrettungspunkt" @@ -22893,5 +23490,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Notfallrettungspunkt bearbeiten" @@ -22900,20 +23497,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Punktname" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)" @@ -22921,5 +23518,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Tierarzt" @@ -22928,64 +23525,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Tierarzt bearbeiten" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "Geografie" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Orte" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Kontinent bearbeiten" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Staat" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Staat bearbeiten" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Bundesland" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Bundesland bearbeiten" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Region bearbeiten" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Landkreis" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Landkreis bearbeiten" @@ -22993,15 +23590,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Großstadt" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Großstadt bearbeiten" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Stadt" @@ -23009,10 +23606,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Stadt bearbeiten" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Stadtteil" @@ -23020,25 +23617,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Stadtteil bearbeiten" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Dorf" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Dorf bearbeiten" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Weiler" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Weiler bearbeiten" @@ -23046,5 +23643,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Unbewohnter Ort" @@ -23052,10 +23649,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Unbewohnten Ort bearbeiten" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Insel" @@ -23063,10 +23660,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Insel bearbeiten" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "Kleine Insel" @@ -23074,5 +23671,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "Kleine Insel bearbeiten" @@ -23080,5 +23677,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Höhleneingang" @@ -23086,10 +23683,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Höhleneingang bearbeiten" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Bergspitze" @@ -23097,10 +23694,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Bergspitze bearbeiten" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Gletscher" @@ -23108,10 +23705,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Gletscher bearbeiten" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Vulkan" @@ -23119,70 +23716,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Vulkan bearbeiten" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Grenzen" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Staat" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Staatsgrenze bearbeiten" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Innerstaatlich" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Innerstaatliche Grenze bearbeiten" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Zivil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Zivilrechtliche Grenze bearbeiten" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Politisch" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Politische Grenze bearbeiten" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Nationalpark" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Nationalparkgrenze bearbeiten" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Landnutzung" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Baum" @@ -23191,15 +23788,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Baum bearbeiten" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botanischer Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Naturwald" @@ -23208,5 +23805,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Naturwald bearbeiten" @@ -23214,17 +23811,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "Nadelwald" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "Laubwald" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "Mischwald" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Forst" @@ -23233,14 +23830,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Forst bearbeiten" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Naturdenkmal & Reservat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Naturdenkmal oder Reservat bearbeiten" @@ -23248,25 +23845,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Geröll" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Geröll bearbeiten" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Buschland" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Buschland bearbeiten" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Gebirge" @@ -23274,10 +23871,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Gebirge bearbeiten" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Heide" @@ -23285,5 +23882,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Heide bearbeiten" @@ -23291,5 +23888,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Bauernhof" @@ -23298,45 +23895,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Bauernhof bearbeiten" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Ackerland" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Ackerland bearbeiten" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Wiese" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Wiese bearbeiten" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Weinberg" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Weinberg bearbeiten" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Schrebergärten" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Schrebergärten bearbeiten" @@ -23344,25 +23941,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Garten" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Garten bearbeiten" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Gras" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Grasfläche bearbeiten" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Dorfanger" @@ -23370,10 +23967,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Dorfanger bearbeiten" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Öffentlicher Bereich" @@ -23381,20 +23978,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Öffentlichen Bereich bearbeiten" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Park bearbeiten" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Erholungsgebiet" @@ -23402,5 +23999,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Erholungsgebiet bearbeiten" @@ -23408,15 +24005,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Wohngebiet" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Wohngebiet bearbeiten" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Kleiner Friedhof" @@ -23424,9 +24021,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Kleinen Friedhof bearbeiten" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Friedhof" @@ -23434,39 +24031,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Friedhof bearbeiten" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Einkaufsbereich" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Einkaufsbereich bearbeiten" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Gewerbegebiet" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Gewerbegebiet bearbeiten" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Industrie" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Industriegebiet bearbeiten" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Eisenbahngelände" @@ -23474,15 +24071,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Eisenbahngelände bearbeiten" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militärgebiet" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Militärgebiet bearbeiten" @@ -23490,55 +24087,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Baustellengebiet" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Baustelle bearbeiten" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Baulücke" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Baulücke bearbeiten" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Bauland" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Bauland bearbeiten" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Deponie" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Deponie bearbeiten" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Steinbruch" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Steinbruch bearbeiten" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multipolygon" @@ -23548,5 +24145,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Ein Multipolygon bearbeiten" @@ -23555,10 +24152,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "Äußeres Segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "Inneres Segment" @@ -23566,5 +24163,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Abbiegeeinschränkung" @@ -23573,5 +24170,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Abbiegeeinschränkung bearbeiten" @@ -23579,34 +24176,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Einschränkung" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "Nicht links abbiegen" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "Nicht rechts abbiegen" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "Nicht geradeaus" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "Wendeverbot" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "Nur rechts abbiegen" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "Nur links abbiegen" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "Nur geradeaus" @@ -23615,15 +24212,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "Von Weg" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "Über Knoten oder Weg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "Zu Weg" @@ -23631,5 +24228,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Route" @@ -23638,5 +24235,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Route bearbeiten" @@ -23644,5 +24241,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Routentyp" @@ -23714,24 +24311,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "Fahrrad" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "Bus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "Straße" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "Fähre" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "Ski" @@ -23784,5 +24381,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23791,13 +24388,13 @@ msgstr "Fuß" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "Wandern" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "Straßenbahn" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "Umleitung" @@ -23811,10 +24408,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "U-Bahn" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Symbolbeschreibung" @@ -23822,31 +24419,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Netzwerk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "Routenstatus" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "geplant" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "temporär" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "Verbindung" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Farbe (hex)" @@ -23855,30 +24452,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "Routenabschnitt" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "Vorwärts-Abschnitt" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "Rückwärts-Abschnitt" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "Haltepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "Vorwärts-Haltepunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "Rückwärts-Haltepunkt" @@ -24089,130 +24686,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -24229,98 +24700,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "veraltet" @@ -24697,7 +25077,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "Weg" @@ -24761,13 +25141,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "Eisenbahn" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24783,5 +25242,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "Service" @@ -24795,5 +25254,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "Furt" @@ -24814,5 +25273,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "Wendekreis" @@ -24827,5 +25286,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "Notfallrettungspunkt" @@ -24840,5 +25299,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "Flussufer" @@ -24852,5 +25311,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "Fluss" @@ -24864,5 +25323,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "Dock" @@ -24884,16 +25343,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "Aquädukt" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24990,4 +25437,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25056,13 +25510,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "Zivilisationsbauten" @@ -25108,6 +25562,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -25124,7 +25578,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "Eisenbahnpunkt" @@ -25147,10 +25601,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "Andere Bahnen" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "Eisenbahn-Überlagerung" @@ -25186,11 +25640,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "Alte Eisenbahn" #. color rail +#. #. 1 #. 50000 @@ -25231,6 +25686,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "Rollweg" @@ -25244,5 +25699,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "Terminal" @@ -25264,5 +25719,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "Rollweg (dunkel)" @@ -25276,5 +25731,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "Rollweg (hell)" @@ -25282,4 +25737,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -25329,7 +25791,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "Luftweg" @@ -25346,5 +25808,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "Einfache Piste" @@ -25359,5 +25821,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "Mittelschwere Piste" @@ -25372,5 +25834,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "Fortgeschrittenenpiste" @@ -25385,5 +25847,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "Expertenpiste" @@ -25398,5 +25860,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "freie Piste" @@ -25411,5 +25873,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "Anfängerpiste" @@ -25529,11 +25991,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "Strom" @@ -25547,5 +26009,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "Anlegestelle (Pier)" @@ -25559,5 +26021,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "Pipeline" @@ -25685,12 +26147,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "Freizeit" @@ -25704,5 +26183,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "Jachthafen" @@ -25740,4 +26219,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25756,4 +26251,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25774,8 +26277,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "Einrichtungen" @@ -25877,10 +26382,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "Verkehrseinrichtungen" @@ -26134,5 +26639,5 @@ #. #. -#. +#. #. color health #. @@ -26278,4 +26783,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -26295,23 +26808,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "Einrichtungen (hell)" @@ -26343,6 +26856,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "Wasser (hell)" @@ -26403,14 +26916,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "Gesundheit" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26757,5 +27270,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26778,5 +27290,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "Geschäft" @@ -26848,8 +27361,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "Hotel" @@ -26950,9 +27463,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "Tourismus" @@ -27040,9 +27553,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "Historisch" @@ -27056,5 +27569,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "Steinbruch" @@ -27068,5 +27581,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "Mülldeponie" @@ -27088,5 +27601,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "Wasserbecken" @@ -27100,5 +27613,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "Forst" @@ -27112,5 +27625,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "Farmland" @@ -27133,5 +27646,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "Einkaufsbereich" @@ -27145,5 +27658,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "Industriegebiet" @@ -27157,5 +27670,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "Baulücke" @@ -27169,5 +27682,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "Bauland" @@ -27181,5 +27694,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "Eisenbahnland" @@ -27236,7 +27749,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "Militär" @@ -27250,5 +27763,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "Friedhof" @@ -27261,5 +27774,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "Berggipfel" @@ -27274,5 +27787,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "Gletscher" @@ -27286,5 +27799,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "Vulkan" @@ -27339,8 +27852,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "Natur" @@ -27354,5 +27867,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "Buschland" @@ -27366,5 +27879,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "Heide" @@ -27378,5 +27891,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "Waldfläche" @@ -27390,5 +27903,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "Schlick & Moor" @@ -27402,5 +27915,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "Strand" @@ -27478,8 +27991,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "Route" @@ -27527,7 +28040,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "Grenze" @@ -27677,11 +28190,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "Ort" @@ -27729,6 +28242,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "Adresse" @@ -28084,13 +28597,187 @@ msgstr "Sizilien - Italien" +#~ msgid "Updating primitive" +#~ msgstr "Objekt aktualisieren" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Schließende Klammer erwartet." + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene \"{1}" -#~ "\" nicht mehr existiert." +#~ "Aktuelle Anzahl an Modifikationen ({0}) überschreitet die maximale Anzahl " +#~ "({1})." + +#~ msgid "User with the same uid but different name found" +#~ msgstr "" +#~ "Ein Benutzer mit der gleichen ID aber mit einem unterschiedlichen Namen " +#~ "wurde gefunden" + +#~ msgid "Use an open changeset" +#~ msgstr "Offenen Änderungssatz verwenden" + +#~ msgid "" +#~ "I can take a picture of my GPS receiver.
Can this help?" +#~ msgstr "" +#~ "Ich kann ein Bild meines GPS-Empfängers machen.
Ist das " +#~ "hilfreich?" + +#~ msgid "All images" +#~ msgstr "Alle Bilder" + +#~ msgid "Images with no exif position" +#~ msgstr "Bilder ohne EXIF-Position" + +#~ msgid "Not yet tagged images" +#~ msgstr "Noch nicht referenzierte Bilder" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "{0} Treffer für {1} in GPS-Spur {2} gefunden" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPS-Spur geladen" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Offset zwischen GPS-Spur und Bildern: {0}m {1}s" + +#~ msgid "Default Values" +#~ msgstr "Standardwerte" + +#~ msgid "Enable proxy server" +#~ msgstr "Proxy-Server verwenden" + +#~ msgid "Anonymous" +#~ msgstr "Anonym" + +#~ msgid "Proxy server host" +#~ msgstr "Proxyserver-Hostname" + +#~ msgid "Proxy server port" +#~ msgstr "Proxyserver-Port" + +#~ msgid "Proxy server username" +#~ msgstr "Proxyserver-Nutzername" + +#~ msgid "Proxy server password" +#~ msgstr "Proxyserver-Passwort" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, vielleicht fehlende Merkmale." + +#~ msgid "Preparing data..." +#~ msgstr "Daten werden vorbereitet...." + +#~ msgid "Preparing..." +#~ msgstr "Daten vorbereiten..." + +#~ msgid "Uploading..." +#~ msgstr "Daten hochladen..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Passwort oder Benutzername falsch." + +#~ msgid "Enter Password" +#~ msgstr "Passwort eingeben" + +#~ msgid "Login" +#~ msgstr "Anmelden" + +#~ msgid "Error: failed to add authentication credentials to the connection." +#~ msgstr "" +#~ "Fehler: Anmeldedaten konnten nicht zur Verbindung hinzugefügt werden." + +#~ msgid "Auto-tag source added:" +#~ msgstr "Automatisches \"source\"-Merkmal:" + +#~ msgid "Interpolation" +#~ msgstr "Interpolation" + +#~ msgid "Optional" +#~ msgstr "Optional" + +#~ msgid "Shop" +#~ msgstr "Geschäft" + +#~ msgid "aqueduct" +#~ msgstr "Aquädukt" + +#~ msgid "Image" +#~ msgstr "Bild" + +#~ msgid "Images for {0}" +#~ msgstr "Bilder für {0}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden." + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS Ende: {0}" + +#~ msgid "timezone difference: " +#~ msgstr "Zeitzonen Unterschied: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} innerhalb der GPS-Spur." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Georeferenzierte Bilder" + +#~ msgid "osmarender options" +#~ msgstr "Einstellungen für Osmarender" #~ msgid "Download all incomplete ways and nodes in relation" #~ msgstr "" #~ "Alle nicht vollständigen Wege und Knoten der Relation herunterladen." + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden" + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS Start: {0}" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Keine Zeit für Punkt {0} x {1}" + +#~ msgid "Read GPX..." +#~ msgstr "GPX lesen..." + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)" + +#~ msgid "Sync clock" +#~ msgstr "Uhrzeit synchronisieren" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden." + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)" + +#~ msgid "current delta: {0}s" +#~ msgstr "Aktueller Unterschied: {0}s" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Bilder mit AgPifoJ öffnen..." + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Zeit mit GPS-Gerät synchronisieren" + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten." + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Ein weiteres Georeferenzierungsplugin für JOSM. Es korreliert Bilder mit " +#~ "GPS-Spuren oder importiert mit EXIF georeferenzierte Bilder." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Etliche Werkzeuge, welche einem das Leben vereinfachen. Zum Beispiel Weg " +#~ "vereinfachen, Flächen verbinden, Springe zur Position" #~ msgid "" @@ -28101,57 +28788,9 @@ #~ "Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt." -#~ msgid "Images for {0}" -#~ msgstr "Bilder für {0}" - -#~ msgid "Read GPX..." -#~ msgstr "GPX lesen..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Keine Zeit für Punkt {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden." - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS Start: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS Ende: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "Aktueller Unterschied: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "Zeitzonen Unterschied: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} innerhalb der GPS-Spur." - -#~ msgid "Sync clock" -#~ msgstr "Uhrzeit synchronisieren" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten." - -#~ msgid "Image" -#~ msgstr "Bild" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Zeit mit GPS-Gerät synchronisieren" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Die eingegebene Zeit konnte nicht eingelesen werden." +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "Start des Plugins {0} wurde veranlasst. Dieses Plugin wird nicht mehr " +#~ "benötigt." #~ msgid "" @@ -28161,4 +28800,13 @@ #~ "Achtung: Für die Übertragung ist keine API-Version definiert. Es wird " #~ "daher Version 0.6 benutzt." + +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene \"{1}" +#~ "\" nicht mehr existiert." + +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "Gruppiert bekannte Adressinterpolation in einem Dialogfenster." #~ msgid "" @@ -28170,34 +28818,2 @@ #~ "benötigen eine Übertragung der Änderungen. Dies wird ignoriert, da die " #~ "Server-API es nicht versteht." - -#~ msgid "" -#~ "Loading of {0} plugin was requested. This plugin is no longer required." -#~ msgstr "" -#~ "Start des Plugins {0} wurde veranlasst. Dieses Plugin wird nicht mehr " -#~ "benötigt." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Georeferenzierte Bilder" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Bilder mit AgPifoJ öffnen..." - -#~ msgid "osmarender options" -#~ msgstr "Einstellungen für Osmarender" - -#~ msgid "Group common Address Interpolation inputs in a single dialog," -#~ msgstr "Gruppiert bekannte Adressinterpolation in einem Dialogfenster." - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "Ein weiteres Georeferenzierungsplugin für JOSM. Es korreliert Bilder mit " -#~ "GPS-Spuren oder importiert mit EXIF georeferenzierte Bilder." - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Etliche Werkzeuge, welche einem das Leben vereinfachen. Zum Beispiel Weg " -#~ "vereinfachen, Flächen verbinden, Springe zur Position" Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 19198) +++ /applications/editors/josm/i18n/po/el.po (revision 19199) @@ -4,9 +4,10 @@ # FIRST AUTHOR , 2008. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" "PO-Revision-Date: 2009-11-17 17:54+0000\n" "Last-Translator: alichani \n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:29+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Δημιουργία κύριου GUI" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Βοήθεια" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Προειδοποίηση" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "Περί του JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -277,5 +279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -284,5 +286,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -291,15 +293,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Συνέχεια" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -308,29 +315,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -347,5 +355,9 @@ msgstr "Ακύρωση" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -361,5 +373,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Συγχώνευση" @@ -377,15 +389,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Προσθήκη Κόμβου..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Προσθήκη κόμβου με εισαγωγή γεωγραφικού πλάτους και μήκους." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -401,22 +413,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Επεξεργασία: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Εισάγετε τις συντεταγμένες για τον νέο κόμβο." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Χρησιμοποιήστε δεκαδικές μοίρες" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Αρνητικές τιμές υποδεικνείουν Δυτικό/Νότιο ημισφαίριο." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -425,5 +437,5 @@ msgstr "Γεωγραφικό πλάτος" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -432,28 +444,29 @@ msgstr "Γεωγραφικό μήκος" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -465,9 +478,9 @@ msgstr "Εντάξει" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -488,18 +501,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -511,5 +524,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -531,6 +544,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -577,5 +590,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "σύγκρουση" @@ -612,14 +625,15 @@ msgstr "Καμοία διένεξη για να γίνει ζουμ" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Κλείσιμο ανοιχτών ομάδων αλλαγών" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Κλείνει τις ανοιχτές ομάδες αλλαγών" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -629,21 +643,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Αρχείο: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Δε υπάρχουν ανοιχτές ομάδες αλλαγών" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Καμία ανοιχτή ομάδα αλλαγών" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Λήψη ανοιχτών ομάδων αλλαγών..." @@ -724,11 +738,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -807,16 +822,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -852,5 +872,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Αντιγραφή" @@ -893,10 +913,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Εξαγωγή σε GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Εξαγωγή των δεδομένων σε αρχείο GPX." @@ -911,12 +931,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -941,8 +961,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -953,10 +973,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -969,17 +989,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1016,22 +1036,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Ένωση αλληλοκαλυπτόμενων Περιοχών" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία εργασία για λήψη" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1041,38 +1066,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Παρακαλώ ακυρώστε αν δεν είστε σίγουροι" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "Δεν βρέθηκε διασταύρωση. Τίποτα δεν αλλάχθηκε." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Προστέθηκε κόμβος σε όλες τις διασταυρώσεις" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Δίορθωση σχέσεων" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1080,33 +1101,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Εισάγετε τιμές για όλες τισ διενέξεις." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Επίλυση διενέξεων" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Διόρθωση συγκρούσεων ετικετών" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1269,5 +1290,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Δεν μπορείτε να μετακινήσετε αντικείμενα εκτός κόσμου." @@ -1347,28 +1368,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Ορθογωνισμός Σχήματος" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Μετακίνηση κόμβων ώστε όλες οι γωνίες να είναι 90 ή 270 μοίρες" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1377,9 +1398,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1388,16 +1409,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Ορθογωνισμός" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Χρήση" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Ορθογωνισμός" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1470,18 +1491,18 @@ msgstr "Αδυναμία μετονομασίας αρχείου ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "" @@ -1490,10 +1511,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Αποθήκευση" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Αποθήκευση τεχόντων δεδομένων." @@ -1548,10 +1569,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Αποθήκευση ως..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο." @@ -1594,6 +1615,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1625,5 +1645,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1686,5 +1706,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1692,5 +1712,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1698,5 +1718,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1730,38 +1750,38 @@ msgstr "Αυτός ο κόμβος δεν είναι κολλημένος σε τίποτε άλλο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Κανείς από αυτούς τούς κόμβους δεν είναι κολλημένος σε τίποτε άλλο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για ξεκόλημα." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Επιλέξτε οποιοδήποτε:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Ένας κόμβος με ετικέτα, ή" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Ένας κόμβος που χρησιμοποιείται από παραπάνω από έναν δρόμο, ή" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1770,5 +1790,5 @@ "χρησιμοποιούνται από περισσότερο από έναν δρόμο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1778,9 +1798,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Ξεκολημένος Κόμβος" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1788,5 +1808,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1821,10 +1841,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1832,53 +1852,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Ενημέρωση Επιλογής" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Κενή επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Αποστολή δεδομένων" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1887,5 +1903,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1893,131 +1909,7 @@ msgstr "Δεν υπάρχουν αλλαγές προς αποστολή" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Αποστολή δεδομένων επιπέδου ''{0}''" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2152,9 +2044,9 @@ msgstr "Λήψη Δεδομένων GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Λήψη δεδομένων" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2162,5 +2054,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2231,7 +2123,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2246,58 +2138,52 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Σχεδίαση" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Σχεδίαση κόμβων" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "επιλεγμένο" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Δεν μπορείτε να προσθέσετε κόμβο εκτός κόσμου." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Προσθήκη κόμβου" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 +msgid "Connect existing way to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 +msgid "Add a new node to an existing way" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 -msgid "Connect existing way to node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 -msgid "Add a new node to an existing way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 msgid "Add node into way and connect" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Δημιοθργία νέου κόμβου." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Επιλογή κόμβου στο σημείο του κέρσορα." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2306,14 +2192,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Τέλος σχεδιασμού." @@ -2354,18 +2240,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Επιλέξτε" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Επιλέξτε, μετακινήστε και περιστρέψτε αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2374,17 +2261,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2394,9 +2281,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -2404,5 +2291,5 @@ "τετράγωνο" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2411,9 +2298,9 @@ "συγχώνευση με το πλησιέστερο κόμβο." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2423,5 +2310,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Ζουμ" @@ -2445,5 +2332,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Αναζήτηση αντικειμένων." @@ -2533,7 +2420,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - όλα τα αντικείμενα που αλλάχθηκαν από τον χρήστη" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2542,8 +2428,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2551,45 +2445,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - όλα τα αλλαγμένα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - όλα τα επιλεγμένα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - όλα τα ημιτελή αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - όλα τα αντικείμενα χωρίς ετικέτες" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2597,55 +2497,55 @@ msgstr "Φίλτρο" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Αναζήτηση" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Έναρξη αναζήτησης" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Δεν βρέθηκε αποτέλεσμα για ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Τίποτα δεν αφαιρέθηκε από την επιλογή ψάχνοντας για \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Βρέθηκαν {0} αποτελέσματα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2655,40 +2555,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Αναμενόταν κλείσιμο παρένθεσης." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +msgid "Missing parameter for OR" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +msgid "Missing right parent" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +msgid "Missing operator for NOT" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2697,9 +2597,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2708,7 +2608,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2742,39 +2647,29 @@ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Ο τρέχων αριθμός αλλαγών υπερβαίνει το μέγιστο αριθμό αλλαγών, τρέχων είναι " -"{0}, μέγιστος είναι {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Παραβίαση Προυποθέσεων" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Παραβίαση Δυνατοτήτων API" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Παραβίαση Προυποθέσεων" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2886,5 +2781,5 @@ msgstr "Ρύθμιση {0}={1} για {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2899,5 +2794,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -2998,4 +2893,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3107,5 +3017,5 @@ msgstr "Εφαρμογή;" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3187,15 +3097,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3204,5 +3114,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3211,5 +3121,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3218,5 +3128,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3225,5 +3135,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3231,5 +3141,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3238,5 +3148,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3245,5 +3155,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3252,5 +3162,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3259,10 +3169,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3270,24 +3180,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Οι προτιμήσεις αποθηκεύθηκαν στο {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Αδυναμία αποστολής προτιμήσεων. Λόγος: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Αδυναμία φόρτωσης προτιμήσεων από διακομηστή" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3296,5 +3206,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3323,5 +3233,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3343,31 +3253,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "Ν" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "Β" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "Δ" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "Α" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3375,5 +3278,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3384,27 +3287,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3412,5 +3315,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3422,5 +3325,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3428,25 +3331,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3454,43 +3357,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3498,5 +3413,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3524,10 +3439,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3535,7 +3446,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3550,5 +3461,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3566,146 +3477,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Άγνωστος ρόλος \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Άγνωστος τύπος μέλους για το \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Οδός \"από\" δεν βρέθηκε." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "Χωρίς ετικέτα" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "κείμενο" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Σφάλμα: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Προειδοποίηση: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "ανενεργό" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "επιλεγμένο" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3714,6 +3617,6 @@ msgstr[1] "κόμβοι" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3722,7 +3625,8 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3731,20 +3635,36 @@ msgstr[1] "σχέσεις" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "φόντο" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" +msgstr "" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "Χωρίς ετικέτα" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "κείμενο" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" msgstr "" @@ -3887,5 +3807,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "σιδηρόδρομος" @@ -3901,7 +3821,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3917,4 +3837,10 @@ msgstr[1] "{0} μέλη" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3946,6 +3872,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Διένεξη" @@ -3959,7 +3885,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4040,74 +3966,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Όνομα χρήστη" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Κωδικός" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "χρήση" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "Επιλογές" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Εμφάνιση αυτής της βοήθειας" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Λήψη της τοποθεσίας στο URL (με lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Άνοιγμα αρχείου (ως ακατέργαστο gps, αν είναι .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Επιλογή με την δοθείσα αναζήτηση" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Ρυθμίστε την γλώσσα." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4116,9 +4042,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "παραδείγματα" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4129,37 +4055,37 @@ "ότι φορτώσατε δεδομένα πριν το --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "" "Αντί για το --download= μπορείτε να καθορίσεται το osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Ενεργοποίηση ενημερωμένων πρόσθετων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Ρύθμιση προκαθορισμένων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Φόρτωση πρόσθετων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Αρχείο" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4174,22 +4100,22 @@ msgstr "Επεξεργασία" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Προβολή" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Εργαλεία" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Προεπιλογές" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4197,5 +4123,5 @@ msgstr "Μενού: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Ήχος" @@ -4274,13 +4200,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "το επίπεδο δεν είναι στη λίστα." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4313,5 +4240,5 @@ msgstr "Αρχικοποίηση" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4319,6 +4246,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4327,5 +4254,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4334,5 +4261,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4341,25 +4268,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4367,9 +4294,9 @@ msgstr "Ρόλος" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4401,11 +4328,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Ιδιότητες" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4414,6 +4341,6 @@ msgstr "Ετικέτες" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4421,6 +4348,6 @@ msgstr "Κόμβοι" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4428,40 +4355,40 @@ msgstr "Μέλη" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4469,21 +4396,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4515,22 +4442,22 @@ msgstr "το αντικείμενο {0} δεν βρέθηκε στην λίστα" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "κλείδωμα κύλισης" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Σύγκριση " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Η έκδοση μου" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4538,5 +4465,5 @@ msgstr "Συγχωνευμένη έκδοση" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4544,18 +4471,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Η έκδοση τους" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> κορυφή" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" @@ -4563,13 +4490,13 @@ "κόμβων" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4577,5 +4504,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4583,14 +4510,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4598,5 +4525,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4604,23 +4531,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα πάνω κατά μία θέση" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Κάτω" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα κάτω κατά μία θέση" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4631,28 +4558,28 @@ msgstr "Αφαίρεση" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "" "Αφαίρεση των επιλεγμένων εγγραφών από την λίστα συγχωνευμένων στοιχείων" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Πάγωμα" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Πάγωμα" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Πάγωμα της τρέχουσας λίστας συγχωνευμένων στοιχείων" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Ξεπάγωμα" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Ξεπάγωμα της λίστας συγχωνευμένων στοιχείων και έναρξη συγχώνευσης" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4661,5 +4588,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4668,5 +4595,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4675,5 +4602,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4682,5 +4609,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4689,5 +4616,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4697,5 +4624,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4930,10 +4857,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4943,10 +4870,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5031,9 +4958,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5041,6 +4968,6 @@ msgstr "καμοία" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "όλα" @@ -5129,7 +5056,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5139,6 +5066,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5246,4 +5173,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Διαγραφή επιλεγμένων αντικειμένων." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Αλλαγή τιμών;" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Λήψη" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Λήψη δεδομένων χάρτη από τον διακομιστή του OSM" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Κλείνει τις ανοιχτές ομάδες αλλαγών" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5257,12 +5236,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5280,13 +5259,13 @@ msgstr "Σωρός Εντολών: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Επίλυση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5294,6 +5273,6 @@ "λίστα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5301,25 +5280,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Εφαρμογή επίλυσης συγκρούσεων και κλείσιμο του διαλόγου" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Εφαρμογή επίλυσης" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Συνέχιση επίλυσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5331,26 +5310,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Επίλυση συγκρούσεων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5361,41 +5340,41 @@ msgstr "Προσθήκη" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5434,5 +5413,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5447,34 +5426,34 @@ msgstr "Άνοιγμα λίστας όλων τον φορτωμένων απιπέδων." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Διαγραφή του επιλεγμένου επιπέδου." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Εμφάνιση/Απόκρυψη" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω." @@ -5484,5 +5463,178 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Σχέσεις" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Άνοιγμα λίστας όλων τον σχέσεων." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Σχέσεις: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Διαγραφή της επιλεγμένης σχέσης" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Σημιουργία νέας σχέσης" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Τρέχουσα επιλογή" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Άνοιγμα παραθύρου λίστας επιλογμένων" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Ζούμ στα επιλεγμένα στοιχεία" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Ζουμ στην επιλογή" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Επιλ.: Σχεσ.:{0} / WaysQ{1} / Κόμβοι:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Επιλογή" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Επιλογή: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Κλείστε αυτόν τον πίνακα. Μπορείτε να τον ξανανοίξετε με τα κουμπιά στην " +"αριστερή εργαλειοθήκη." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Συγγραφείς" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "" +"Άνοιγμα λίστας των ατόμων που εργάζονται πάνω στα απιλεγμένα αντικείμενα." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Συγγραφέας" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Αντικείμενα" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "μη ολοκληρωμένη" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "Κλείσιμο" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Λήψη ανοιχτών ομάδων αλλαγών..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5491,22 +5643,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "<διαφορετικά>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Αλλαγή τιμών;" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5515,5 +5667,5 @@ msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5522,230 +5674,72 @@ msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Παρακαλώ επιλέξτε κλειδί" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Παρακαλώ επιλέξτε μια τιμή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "" "Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Ιδιότητες/Υπαγωγές" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Ιδιότητες επιλεγμένων αντικειμένων." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Μέλος του" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Προσθήκη Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Ιδιότητες / Υπαγωγές" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Αλλαγή σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Διαγραφή από σχέση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Διαγραφή Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Σχέσεις" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Άνοιγμα λίστας όλων τον σχέσεων." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Σχέσεις: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Διαγραφή της επιλεγμένης σχέσης" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Σημιουργία νέας σχέσης" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Τρέχουσα επιλογή" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Άνοιγμα παραθύρου λίστας επιλογμένων" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Ζούμ στα επιλεγμένα στοιχεία" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Ζουμ στην επιλογή" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Επιλ.: Σχεσ.:{0} / WaysQ{1} / Κόμβοι:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Επιλογή" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Επιλογή: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Κλείστε αυτόν τον πίνακα. Μπορείτε να τον ξανανοίξετε με τα κουμπιά στην " -"αριστερή εργαλειοθήκη." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Συγγραφείς" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "" -"Άνοιγμα λίστας των ατόμων που εργάζονται πάνω στα απιλεγμένα αντικείμενα." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Συγγραφέας" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Αντικείμενα" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5814,12 +5808,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Προορισμός Λήψης" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "({0}/{1}) Φόρτωση γονέων σχέσης {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -5837,14 +5830,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Εφαρμογή επίλυσης" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5853,14 +5844,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5870,9 +5861,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5882,15 +5873,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5898,5 +5889,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5904,20 +5895,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5926,70 +5917,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Άθλημα" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "Μετακίνηση των επιλεγμένων μελών πάνω" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5998,9 +5988,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6009,48 +5999,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Λήψη μελών" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Λήψη μελών" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6060,34 +6049,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6199,10 +6188,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6212,5 +6201,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6296,9 +6285,4 @@ msgid "Download Area" msgstr "Λήψη Περιοχής" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Λήψη" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6600,6 +6584,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6612,6 +6594,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6882,4 +6862,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7102,5 +7086,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7143,116 +7127,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Όνομα" @@ -7276,15 +7260,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Τύπος" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7455,10 +7439,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7466,5 +7450,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7472,9 +7456,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7589,6 +7573,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "άγνωστο" @@ -7610,13 +7594,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7651,4 +7635,116 @@ msgstr "Έκδοση" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7667,39 +7763,147 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Αποστολή Αλλαγών" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Κλείσιμο πακέτου αλλαγών" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Αποθήκευση χρήστη και κωδικού (χωρίς κρυπτογράφηση)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Παρακαλώ εισάγετε ένα όνομα χρήστη" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Προειδοποίηση: Ο κωδικός μεταδίδεται χωρίς κρυπτογράφηση" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Αυτόματο Κεντράρισμα" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Αλλαγή σχέσης" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7767,17 +7971,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "Μη αποθηκευμένες αλλαγές - Αποθήκευση/Αποστολή πριν την διαγραφή;" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "Αποστολή και αποθήκευση αλλαγμένων επιπέδων ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7790,9 +7994,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7806,9 +8010,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7823,33 +8027,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Απόρριψη και Έξοδος" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "Αποθήκευση/Αποστολή και Έξοδος" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" @@ -7857,18 +8061,18 @@ "και/ή θα αποθηκευθούν." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "Αποθήκευση/Αποστολή και Διαγραφή" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "Προετοιμασία επιπέδου \"{0}\" για αποστολή ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7876,5 +8080,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7947,40 +8151,375 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Αποστολή" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "πίστα προχορημένη" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Ρύθμιση διαθέσιμων πρόσθετων." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Αποστολή δεδομένων επιπέδου ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Αποστολή Αλλαγών" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Αποστολή δεδομένων επιπέδου ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Περί" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Αντικείμενα που θα προστεθούν:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Αντικείμενα που θα αλλαχτούν" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Αντικείμενα που θα διαγραφούν:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7989,5 +8528,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -7996,5 +8535,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8003,208 +8542,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Αποστολή Αλλαγών" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "ΠΑρακλώ εισάγετε τις επιθυμητές συντεταγένες πρώτα." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} μέτρα" -msgstr[1] "{0} μέτρα" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Παρακαλώ εισάγετε ένα όνομα χρήστη" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "σημείο gps" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Προσαρμογή του σχεδιασμού γραμμών" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Χρηση καθολικών ρυθμίσεων." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8212,5 +8580,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8219,5 +8587,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8299,5 +8667,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Περιγραφή" @@ -8329,10 +8697,10 @@ msgstr[1] "{0} σημεία αναφοράς" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Μετατροπή σε επίπεδο δεδομένων" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8342,12 +8710,12 @@ "βλαβερή.
Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8356,29 +8724,29 @@ msgstr "Μετατράπηκε από: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Λήψη όλων εντός:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} μέτρα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Μέγιστη περιοχή ανά αίτημα:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} τετρ. χλμ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8389,10 +8757,10 @@ "συνεχίσετε;" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" "Δεν υπάρχει διαθέσιμο ίχνος GPX στο επίπεδο για την συσχέτιση με τον ήχο." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8400,5 +8768,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8406,23 +8774,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Επίπεδο Δεδομένων {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "εκτός περιοχής λήψης" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "έκδοση {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8431,5 +8799,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8443,5 +8811,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8454,11 +8822,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8467,36 +8835,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "το {0} αποτελείται από:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "Έκδοση API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Μετατροπή σε επίπεδο GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8504,5 +8872,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8511,5 +8879,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8517,5 +8885,5 @@ msgstr[1] "σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8524,5 +8892,5 @@ msgstr[1] "ένα ίχνος με {0} σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8531,5 +8899,5 @@ msgstr[1] "το {0} αποτελείται από {1} ίχνη" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8538,24 +8906,24 @@ msgstr[1] "{0} σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Αρχεία GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Σφάλμα κατά την ερμηνεία {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Αδυναμία ανάγνωσης \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8564,34 +8932,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Ώρα φωτογραφίας (από exif):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Ώρα Gps (διαβάστε από την παραπάνω φωτογραφία): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [ηη/μμ/εεεε ωω:λλ:δδ]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Βρίσκομαι στην ζώνη ώρας: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Χωρίς ημερομηνία" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Άνοιγμα άλλης φωτογραφίας" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Συγχρονισμός ώρας από φωτογραφία του δέκτη GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8599,71 +8967,155 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Μη έγκυρη ημερομηνία" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "Ίχνος GPX: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Άνοιγμα άλλου ίχνους GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Ενημέρωση θέσης για: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Ζώνη Ώρας: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Μετατόπιση:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Μπορώ να βγάλω φωτογραφία τον δέκτη GPS μου.
Μπορεί αυτό να " -"βοηθήσει;" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Ενημέρωση θέσης για: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Όλες οι εικόνες" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Εικόνες χωρίς θέση exif" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Τίποτα επιλεγμένο!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Συσχέτιση" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Λανθασμένη ζώνη ώρας" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Ζώνη ώρας: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Λεπτά: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Δευτερόλεπτα: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Διαφορά ώρας {0} ημερών)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Ρύθμιση ζώνης ώρας και απόκλεισης" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "Οι επιλεγμένες φωτογραφίες δεν περιέχουν πληροφορίες ώρας." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Οι φωτογραφίες δεν περιέχουν πληροφορίες ώρας" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "Τ οίχνος GPX δεν περιέχει πληροφορίες ώρας" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "Πρέπει να επιλέξετε ένα ίχνος GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "Δεν επιλέχθηκε ίχνος GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8672,9 +9124,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Λανθασμένη ζώνη ώρας" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8683,134 +9131,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Οι επιλεγμένες φωτογραφίες δεν περιέχουν πληροφορίες ώρας." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Οι φωτογραφίες δεν περιέχουν πληροφορίες ώρας" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "Τ οίχνος GPX δεν περιέχει πληροφορίες ώρας" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Ζώνη ώρας: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Λεπτά: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Δευτερόλεπτα: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Διαφορά ώρας {0} ημερών)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Απόκλειση ανάμεσα σε ίχνος και φωτογραφίες: {0}λ {1}δ" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Ρύθμιση ζώνης ώρας και απόκλεισης" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Εξαγωγή τοποθεσιών GPS από EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Έναρξη σάρωσης καταλόγου" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Ανάγνωση φωτογραφιών" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Ανάγνωση {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Σάρωση καταλόγου {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8818,52 +9188,99 @@ msgstr[1] "εικόνες" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Το αρχείο δεν βρέθηκε." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Χωρίς εικόνα" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Φόρτωση {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Σφάλμα στο αρχείο {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Εμφάνιση γεοσημασμένων φωττογραφιών" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Προηγούμενο" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Προηγούμενη εικόνα" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Εναλλαγή: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Αφαίρεση φωτογραφίας από επίπεδο" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Διαγραφή από σχέση" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Επόμενο" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Επόμενη εικόνα" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Κεντράρισμα επιπέδου" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8874,5 +9291,5 @@ "Υψόμετρο: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8973,4 +9390,12 @@ msgid "Error displaying URL" msgstr "Σφάλμα στην εμφάνιση του URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9187,7 +9612,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Όλα" @@ -9256,6 +9680,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Ποδήλατο" @@ -9645,31 +10069,92 @@ msgstr "Η προβολή {0} δεν μπορούσε να ενεργοποιηθεί. Χρησιμοποιώ το Mercator" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Ενεργοποίηση διαμεσολαβητή" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonymous" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Νοσοκομείο" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Θύρα:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Κωδικός" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Ρυθμίσεις διαμεσολαβητή" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Διεύθυνση μεσολαβητή" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Θύρα μεσολαβητή" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Όνομα χρήστη διαμεσολαβητή" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Κωδικός διαμεσολαβητή" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "Η βασική URL για τον διακομιστή OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί ο " +"κωδικός." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Η βασική URL για τον διακομιστή" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "Όνομα χρήστη OSM (e-mail)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "Κωδικός OSM" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9952,5 +10437,5 @@ msgstr "<πολλαπλές>" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9960,13 +10445,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9974,18 +10459,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Άγνωστος τύπος: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9996,16 +10481,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Σφάλμα ανάλυσης {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Υποστηρίζονται στοιχεία τύπου {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10014,18 +10499,18 @@ msgstr[1] "Αλλαγή {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Τίποτα επιλεγμένο!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Εφαρμογή Προεπιλογής" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Αλλαγή ιδιοτήτων" @@ -10054,4 +10539,11 @@ msgstr "Μεταφόρτωση σημείων {0} ως {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10067,12 +10559,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, πιθανόν να λείπουν κάποιες ετικέτες" - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Προετοιμασία δεδομένων..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10175,16 +10722,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10194,40 +10741,40 @@ msgstr "Μεταφόρτωση δεδομένων OSM..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10235,10 +10782,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Μεταφόρτωση σημείων {0} ως {1}..." -msgstr[1] "Μεταφόρτωση σημείων {0} ως {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10275,14 +10822,14 @@ msgstr "Αποτυχία εισαγωγής NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10291,16 +10838,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10308,66 +10855,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Με επιτυχία άνοιξε το changeset {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Κλείσιμο πακέτου αλλαγών" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Προετοιμασία..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Αποστολή..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Προετοιμασία δεδομένων..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Αλλαγή {0} αντικειμένου" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10393,4 +10951,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10402,5 +10970,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10427,5 +10995,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10433,5 +11001,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10444,5 +11012,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10453,59 +11021,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Λανθασμένος κωδικός ή όνομα χρήστη" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Προειδοποίηση: Ο κωδικός μεταδίδεται χωρίς κρυπτογράφηση" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Αποθήκευση χρήστη και κωδικού (χωρίς κρυπτογράφηση)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Εισάγετε κωδικό" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Είσοδος" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "Η βασική URL για τον διακομιστή OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί ο " -"κωδικός." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Η βασική URL για τον διακομιστή" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "Όνομα χρήστη OSM (e-mail)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "Κωδικός OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10595,5 +11110,12 @@ msgstr "Το αρχείο \"{0}\" δεν υπάρχει" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10602,38 +11124,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10641,19 +11163,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Άγνωστο αντικείμενο με id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10663,8 +11185,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10674,25 +11196,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10700,5 +11238,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10707,5 +11245,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10713,5 +11251,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10720,13 +11258,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Προετοιμασία δεδομένων OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10749,21 +11287,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Λήψη ανοιχτών ομάδων αλλαγών..." +msgstr[1] "Λήψη ανοιχτών ομάδων αλλαγών..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Λήψη ανοιχτών ομάδων αλλαγών..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10791,9 +11341,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10854,5 +11400,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10861,4 +11407,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +msgid "Unexpected id 0 for osm primitive found" msgstr "" @@ -10901,12 +11451,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Διαγραφή {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Σφάλμα κατά την διαγραφή του αρχείου πρόσθετου: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11051,9 +11601,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "δεν υπάρχει περιγραφή" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Περισσότερες λεπτομέρειες" @@ -11186,4 +11736,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11474,6 +12039,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Αποστολή ιχνών" @@ -11559,5 +12124,5 @@ msgstr "Αποστολή Ίχνους GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Αποστολή ιχνών στο openstreetmap.org" @@ -11568,5 +12133,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Παρεμβολή Διευθύνσεων" @@ -11581,11 +12146,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Μονά" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Ζυγά" @@ -11596,24 +12158,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Αριθμός" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "Λιγνίτης" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "εικόνα" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Ενοικίαση" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11743,5 +12301,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11803,21 +12361,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Επιλέξτε από..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11826,13 +12384,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11857,17 +12415,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11879,18 +12437,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Πηγή" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11900,5 +12458,5 @@ "προτιμήσεις του JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11906,54 +12464,51 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Ρύθμιση διαφάνειας επιπέδων WMS. Δεξιά για αδιαφανές, αριστερά για διαφανές." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Τα παλαιότερα αρχεία διαγράφονται αυτόματα όταν ξεπεραστεί αυτό το μέγεθος" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Προσθήκη \"source=...\" στα στοιχεία;" @@ -12155,5 +12710,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Θέση" @@ -12346,5 +12901,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Δε φορτώθηκαν δεδομένα." @@ -12366,9 +12921,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12754,7 +13309,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "νερό" @@ -12911,19 +13466,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Γίνεται σύνδεση" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Σε σύνδεση" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Χωρίς σύνδεση" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Η σύνδεση απέτυχε" @@ -12962,11 +13517,11 @@ msgstr "Επίπεδο LiveGPS" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" @@ -12974,22 +13529,22 @@ "LiveGPS." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Κεντράρισμα μία φορά" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Αυτόματο Κεντράρισμα" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση συνεχώς." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13040,9 +13595,9 @@ msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "κατάσταση μέτρησης" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Μετρήσεις" @@ -13080,5 +13635,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13089,13 +13644,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13242,5 +13797,5 @@ msgstr "εκτελέσιμο Firefox" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13332,5 +13887,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13406,41 +13961,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Φόρτωση πλακιδίου" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Φόρτωση όλων των πλακιδίων" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Άυξηση ζουμ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Μείωση ζουμ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13609,4 +14164,43 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Ζυγά" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Οδοί" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Αριθμός Σημείου" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13625,42 +14219,20 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Δημιουργεί ξεχωριστά κτίρια από ένα μακρύ κτίριο." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Παρεμβολή" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Όνομα οδού" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Προαιρετικό" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13675,5 +14247,5 @@ msgstr "Κανένα σφάλμα επαλήθευσης" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Πλέγμα" @@ -14324,38 +14896,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "κτίριο" @@ -14369,5 +14911,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "" @@ -14482,10 +15024,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Χαρτιά που περπατάνε: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15191,6 +15733,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "" @@ -15636,5 +16178,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Πλάτος (μέτρα)" @@ -15752,5 +16294,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15762,5 +16304,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "άλσος" @@ -16018,4 +16560,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16047,8 +16592,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "ναι" @@ -16196,9 +16743,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "όχι" @@ -16443,5 +16991,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "Οικιστική" @@ -16476,5 +17024,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "" @@ -16508,6 +17056,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "" @@ -16557,5 +17105,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "κυκλικός κόμβος" @@ -16743,6 +17291,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Πεζοπορία" @@ -16863,5 +17411,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16887,4 +17434,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16894,15 +17442,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Λειτουργός" @@ -17114,7 +17662,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Υψόμετρο" @@ -17533,5 +18081,5 @@ msgstr "" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17541,5 +18089,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "έλος" @@ -18065,32 +18613,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Ώρες Λειτουργείας" @@ -18149,91 +18697,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18248,5 +18796,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18265,7 +18813,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Αριθμός Αναφοράς" @@ -18281,5 +18829,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "υπόγειο" @@ -18292,6 +18840,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Κόστος" @@ -18330,22 +18878,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Κατάστημα" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Επεξεργασία Καταστήματος" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Συνεργείο Αυτοκινήτων" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Επεξεργασία Συνεργείου Αυτοκινήτων" @@ -18353,5 +18889,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Ενοικίαση" @@ -18360,10 +18896,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Επεξεργασία Ενοικίασης" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Κοινή χρήση" @@ -18371,5 +18907,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Επεξεργασία κοινής χρήσης αυτοκινήτου" @@ -18377,10 +18913,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Επεξεργασία χώρου στάθμευσης ποδηλάτων" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Χωρητικότητα" @@ -18389,22 +18925,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Επεξεργασία Ενοικίασης ποδηλάτων" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Επεξεργασία Καταστήματος Ποδηλάτων" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Μέσα Μαζικής Μεταφοράς" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18414,5 +18943,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18420,5 +18949,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18426,5 +18955,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -18432,5 +18961,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -18438,5 +18967,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Στάση Τραμ" @@ -18445,5 +18974,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Επεξεργασία Στάσης Τραμ" @@ -18451,5 +18980,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -18458,5 +18987,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -18468,5 +18997,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18474,10 +19003,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Είσοδος υπογείου σιδηρόδρομου" @@ -18486,10 +19015,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Επεξεργασία εισόδου υπογείου σιδηρόδρομου" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Αναπηρικό καρότσι" @@ -18498,5 +19027,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Σταθμός Λεωφορείων" @@ -18505,5 +19034,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Επεξεργασία Σταθμού Λεωφορείων" @@ -18511,5 +19040,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Στάση Λεωφορείου" @@ -18519,5 +19048,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Επεξεργασία Στάσης Λεωφορείου" @@ -18526,17 +19055,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Καταφύγιο" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Παγκάκι" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "" @@ -18544,5 +19081,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Ταξί" @@ -18550,5 +19087,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Επεξεργασία σταθμού ταξί" @@ -18556,5 +19093,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Αεροδρόμιο" @@ -18562,15 +19099,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Επεξεργασία Αεροδρομίου" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18578,10 +19115,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Διαμονή" @@ -18593,5 +19130,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Ξενοδοχείο" @@ -18600,15 +19137,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Επεξεργασία Ξενοδοχείου" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Αστέρια" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "" @@ -18616,20 +19153,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Ξενώνας" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Επεξεργασία Ξενώνα" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Σαλέ" @@ -18637,10 +19174,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Επεξεργασία Σαλέ" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "" @@ -18648,30 +19185,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Χώρος Τροχόσπιτων" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Επεξεργασία Χώρου Τροχόσπιτων" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Χώρος Κάμπινγκ" @@ -18679,10 +19216,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Επεξεργασία Χώρου Κάμπινγκ" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Φαγητό+Ποτά" @@ -18693,5 +19230,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Εστιατόριο" @@ -18699,5 +19236,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Επεξεργασία Εστιατορίου" @@ -18705,5 +19242,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Κουζίνα" @@ -18711,61 +19248,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "ιταλική" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "κινέζικη" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "ελληνική" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "γερμανική" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "ινδική" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "τοπική" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "τουρκική" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "ασιατική" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "ταϊλανδέζικη" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "μεξικάνικη" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "ιαπωνική" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Fast Food" @@ -18773,9 +19310,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Επεξεργασία Εστιατορίου Fast Food" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Καφέ" @@ -18783,9 +19320,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Επεξεργασία Καφέ" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pub" @@ -18793,18 +19330,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Επεξεργασία Pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Μπαρ" @@ -18812,9 +19349,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Επεξεργασία Μπαρ" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Νυχτερινό Κέντρο" @@ -18822,24 +19359,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Νυχτερινό Κέντρο" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Τουρισμός" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Μουσείο" @@ -18847,9 +19384,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Επεξεργασία Μουσείου" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Ζωολογικός Κήπος" @@ -18858,9 +19395,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Επεξεργασία Ζωολογικού Κήπου" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "" @@ -18868,24 +19405,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Πύργος Παρατήρησης" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Θεματικό Πάρκο" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Επεξεργασία Θεματικού Πάρκου" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "" @@ -18893,5 +19430,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "" @@ -18899,19 +19436,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Γραφείο Πληροφοριών" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Χάρτης" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18949,5 +19486,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18955,28 +19492,28 @@ msgstr "οδός" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -18986,5 +19523,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18992,6 +19529,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Ποδηλασία" @@ -18999,5 +19536,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19005,6 +19542,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "" @@ -19012,5 +19549,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19018,46 +19555,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "ιστορία" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19065,29 +19602,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "" @@ -19095,25 +19632,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Τζάκι" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Ιστορικά Σημεία" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Κάστρο" @@ -19122,19 +19659,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Επεξεργασία Κάστρου" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ερείπια" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Επεξεργασία Ερειπίων" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Αρχαιολογικός Χώρος" @@ -19143,9 +19680,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Επεξεργασία Αρχαιολογικού Χώρου" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Πεδίο Μάχης" @@ -19153,10 +19690,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Επεξεργασία Πεδίου Μάχης" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19164,5 +19701,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19170,15 +19707,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Μνημείο" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Επεξεργασία Μνημείου" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Ηρώο" @@ -19186,55 +19723,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Επεξεργασία Ηρώου" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 msgid "Leisure" msgstr "Αναψυχή" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Παιδική Χαρά" @@ -19242,35 +19779,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Επεξεργασία Παιδικής Χαράς" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Ψάρεμα" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Επεξεργασία Ψαρέματος" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Αθλητικά" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Χώροι Άθλησης" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Στάδιο" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Επεξεργασία Σταδίου" @@ -19284,6 +19821,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "επιλέξτε άθλημα:" @@ -19675,30 +20212,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "άθληση" @@ -19708,225 +20245,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "τοξοβολία" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "Καλαθοσφαίρηση" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "Κανόε" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "αναρρήχηση" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "ποδηλασία" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "κυνοδρομίες" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "ποδόσφαιρο" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "σκοποβολή" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "ποδόσφαιρο" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "κολύμβηση" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "επιτραπέζια αντισφαίρηση" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "αντισφαίρηση" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Αθλητικό Κέντρο" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Επεξεργασία Αθλητικού Κέντρου" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Μίνι Golf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Επεξεργασία Μίνι Golf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Άθλημα" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Πολλαπλά" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -19965,21 +20502,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "τύπος" @@ -20018,203 +20555,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "αθλητικό κέντρο" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "στάδιο" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" +#: build/trans_presets.java:1942 +msgid "Edit 10pin" +msgstr "" + +#: build/trans_presets.java:1947 +msgid "Athletics" +msgstr "" + +#. item "Sport/Athletics" +#: build/trans_presets.java:1948 +msgid "Edit Athletics" +msgstr "" + #: build/trans_presets.java:1953 -msgid "Edit 10pin" -msgstr "" - -#: build/trans_presets.java:1958 -msgid "Athletics" -msgstr "" - -#. item "Sport/Athletics" -#: build/trans_presets.java:1959 -msgid "Edit Athletics" -msgstr "" - -#: build/trans_presets.java:1964 msgid "Archery" msgstr "Τοξοβολία" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Επεξεργασία τοξοβολίας" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Αναρρήχηση" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Επεξεργασία Αναρρήχησης" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Επεξεργασία Ποδηλασίας" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Κυνοδρομίες" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Επεξεργασία Κυνοδρομιών" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Ιππικό" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Επεξεργασία Ιππικού" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "" #. item "Sport/Horse Racing" +#: build/trans_presets.java:1990 +msgid "Edit Horse Racing" +msgstr "" + +#: build/trans_presets.java:1995 +msgid "Gymnastics" +msgstr "" + +#. item "Sport/Gymnastics" +#: build/trans_presets.java:1996 +msgid "Edit Gymnastics" +msgstr "" + #: build/trans_presets.java:2001 -msgid "Edit Horse Racing" -msgstr "" - -#: build/trans_presets.java:2006 -msgid "Gymnastics" -msgstr "" - -#. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 -msgid "Edit Gymnastics" -msgstr "" - -#: build/trans_presets.java:2012 msgid "Motor Sports" msgstr "Μηχανοκίνητα Αθλήματα" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Επεξεργασία Μηχανοικίνητων Αθλημάτων" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "" #. item "Sport/Skating" +#: build/trans_presets.java:2008 +msgid "Edit Skating" +msgstr "" + +#: build/trans_presets.java:2013 +msgid "Skateboard" +msgstr "" + +#. item "Sport/Skateboard" +#: build/trans_presets.java:2014 +msgid "Edit Skateboard" +msgstr "" + #: build/trans_presets.java:2019 -msgid "Edit Skating" -msgstr "" - -#: build/trans_presets.java:2024 -msgid "Skateboard" -msgstr "" - -#. item "Sport/Skateboard" -#: build/trans_presets.java:2025 -msgid "Edit Skateboard" -msgstr "" - -#: build/trans_presets.java:2030 msgid "Swimming" msgstr "Κολύμβηση" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Επεξεργασία Κολύμβησης" @@ -20222,56 +20759,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Δυσκολία" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "αρχαρίων" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "εύκολη" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Σκοποβολή" @@ -20279,182 +20816,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Επεξεργασία Σκοποβολής" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Ποδόσφαιρο" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Επεξεργασία Ποδοσφαίρου" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Ποδόσφαιρο" #. item "Sport (Ball)/Football" +#: build/trans_presets.java:2050 +msgid "Edit Football" +msgstr "" + +#: build/trans_presets.java:2055 +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2056 +msgid "Edit Australian Football" +msgstr "" + #: build/trans_presets.java:2061 -msgid "Edit Football" -msgstr "" - -#: build/trans_presets.java:2066 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 -msgid "Edit Australian Football" -msgstr "" - -#: build/trans_presets.java:2072 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Επεξεργασία Baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Καλαθοσφαίρηση" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Επεξεργασία Καλαθοσφαίρησης" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Επεξεργασία Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" +#: build/trans_presets.java:2080 +msgid "Edit Boule" +msgstr "" + +#: build/trans_presets.java:2085 +msgid "Bowls" +msgstr "" + +#. item "Sport (Ball)/Bowls" +#: build/trans_presets.java:2086 +msgid "Edit Bowls" +msgstr "" + #: build/trans_presets.java:2091 -msgid "Edit Boule" -msgstr "" - -#: build/trans_presets.java:2096 -msgid "Bowls" -msgstr "" - -#. item "Sport (Ball)/Bowls" +msgid "Cricket" +msgstr "" + +#. item "Sport (Ball)/Cricket" +#: build/trans_presets.java:2092 +msgid "Edit Cricket" +msgstr "" + #: build/trans_presets.java:2097 -msgid "Edit Bowls" -msgstr "" - -#: build/trans_presets.java:2102 -msgid "Cricket" -msgstr "" - -#. item "Sport (Ball)/Cricket" +msgid "Cricket Nets" +msgstr "" + +#. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + #: build/trans_presets.java:2103 -msgid "Edit Cricket" -msgstr "" - -#: build/trans_presets.java:2108 -msgid "Cricket Nets" -msgstr "" - -#. item "Sport (Ball)/Cricket Nets" +msgid "Croquet" +msgstr "" + +#. item "Sport (Ball)/Croquet" +#: build/trans_presets.java:2104 +msgid "Edit Croquet" +msgstr "" + #: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 -msgid "Croquet" -msgstr "" - -#. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 -msgid "Edit Croquet" -msgstr "" - -#: build/trans_presets.java:2120 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Επεξεργασία Hockey" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + +#: build/trans_presets.java:2121 +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Επεξεργασία Rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Επιτραπέζια Αντισφαίριση" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Αντισφαίριση" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Επεξεργασία Αντισφαίρισης" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Κτήρια" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Κτήριο" @@ -20462,5 +20999,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Δημόσιο Κτήριο" @@ -20468,10 +21005,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Επεξεργασία Δημοσίου Κτηρίου" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Δημαρχείο" @@ -20479,10 +21016,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Επεξεργασία Δημαρχείου" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Πρεσβεία" @@ -20490,10 +21027,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Επεξεργασία Πρεσβείας" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Δικαστήρια" @@ -20502,10 +21039,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Επεξεργασία Δικαστηρίων" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Φυλακή" @@ -20514,10 +21051,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Επεξεργασία Φυλακής" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Αστυνομία" @@ -20527,10 +21064,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Επεξεργασία Αστυνομίας" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Πυροσβεστείο" @@ -20539,10 +21076,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Επεξεργασία Πυροσβεστείου" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Ταχυδρομείο" @@ -20550,5 +21087,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Επεξεργασία Ταχυδρομείου" @@ -20556,15 +21093,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Νηπιαγωγίο" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Επεξεργασία Νηπιαγωγίου" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Σχολείο" @@ -20572,10 +21109,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Επεξεργασία Σχολείου" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Πανεπιστήμιο" @@ -20583,10 +21120,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Επεξεργασία Πανεπιστημίου" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Κολέγιο" @@ -20594,5 +21131,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Επεξεργασία Κολεγίου" @@ -20600,5 +21137,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Κινηματογράφος" @@ -20607,10 +21144,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Επεξεργασία Κινηματογράφου" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Βιβλιοθήκη" @@ -20619,9 +21156,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Επεξεργασία Βιβλιοθήκης" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Κέντρο Τεχνών" @@ -20629,10 +21166,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Επεξεργασία Κέντρου Τεχνών" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Θέατρο" @@ -20641,10 +21178,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Επεξεργασία Θεάτρου" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Τόπος Λατρείας" @@ -20654,5 +21191,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Επεξεργασία Τόπου Λατρείας" @@ -20661,6 +21198,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Θρησκεία" @@ -20669,66 +21206,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "βουδισμός" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "χριστιανισμός" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "ινδουϊσμός" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "ιουδαϊσμός" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "μουσουλμανισμός" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "ταοϊσμός" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Δόγμα" @@ -20737,81 +21274,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "αγγλικανικό" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "βαπτιστικό" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "καθολικό" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "ευαγγελικό" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "μαρτύρων του Ιεχοβά" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "λουθερανικό" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "ορθόδοξο" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "πεντηκωστής" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "προτεσταντικό" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Διευθύνσεις" @@ -20820,5 +21357,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Επεξεργασία διεύθυνσης" @@ -20826,5 +21363,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Αριθμός σπιτιού" @@ -20832,20 +21369,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Όνομα Σπιτιού" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Όνομα οδού" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Όνομα πόλης" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Ταχυδρομικός Κώδικας" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Κωδικός χώρας" @@ -20854,5 +21396,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων" @@ -20860,61 +21402,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Τρόπος Αρίθμησης" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "Μονά" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "Ζυγά" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Πύργος" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Επεξεργασία Πύργου" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20922,25 +21464,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Υδραγωγείο" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Επεξεργασία Υδραγωγείου" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Μετρητής Αερίου" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Επεξεργασία Μετρητή Αερίου" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Φάρος" @@ -20948,10 +21490,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Επεξεργασία Φάρου" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Ανεμόμυλος" @@ -20959,10 +21501,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Επεξεργασία Ανεμόμυλου" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Αγωγός" @@ -20971,37 +21513,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Επεξεργασία Αγωγού" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "Αέριο" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Βιολογικός Καθαρισμός" @@ -21011,10 +21553,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Επεξεργασία Βιολογικού Καθαρισμού" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Γερανός" @@ -21022,10 +21564,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Επεξεργασία Γερανού" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Φάρος" @@ -21033,10 +21575,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Επεξεργασία Φάρου" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "" @@ -21044,10 +21586,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Παρακολούθηση" @@ -21055,5 +21597,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Επεξεργασία Κάμερας Παρακολούθησης" @@ -21061,5 +21603,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Γεννήτρια Ρεύματος" @@ -21069,35 +21611,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Επεξεργασία Γεννήτριας Ρεύματος" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "Αέρας" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "Νερό" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "Πυρηνικό" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "Λιγνίτης" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "Φωτοβολταϊκό" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Σταθμός Παραγωγής Ρεύματος" @@ -21106,10 +21648,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Υποσταθμός Ρεύματος" @@ -21118,5 +21660,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Επεξεργασία Υποσταθμού Ρεύματος" @@ -21124,10 +21666,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Πυλώνας Ρεύματος" @@ -21138,23 +21680,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Επεξεργασία Πυλώνα Ρεύματος" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Αγωγός Μεταφοράς Ρεύματος" @@ -21163,75 +21705,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Τάση ρεύματος" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Τουαλέτες" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Σημείωση" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Γραμματοκιβώτιο" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Τηλέφωνο" @@ -21240,5 +21782,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Επεξεργασία Τηλεφώνου" @@ -21246,5 +21788,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Κέρματα" @@ -21252,5 +21794,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Χαρτονομίσματα" @@ -21258,5 +21800,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21264,5 +21806,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Χρεωστικές Κάρτεσ" @@ -21270,15 +21812,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Πιστωτικές Κάρτες" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Τηλεκάρτες" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Ανακύκλωση" @@ -21287,5 +21829,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Επεξεργασία σταθμού Ανακύκλωσης" @@ -21293,68 +21835,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Μπαταρίες" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Τενεκεδάκια" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Ρούχα" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Γυαλί" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Χαρτί" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Μέταλλα" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Παγκάκι" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21425,39 +21962,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "" @@ -21466,30 +22003,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Ύψος" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "χαμηλό" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "μισό" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "πλήρες" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Κρυψώνα" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Κλειδαριά" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Συντριβάνι" @@ -21498,10 +22035,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Επεξεργασία Συντριβανίου" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Πόσιμο Νερό" @@ -21510,10 +22047,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Επεξεργασία πόσιμου νερού" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Βρεφοδόχος" @@ -21521,33 +22058,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Επεξεργασία Βρεφοδόχου" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Καταστήματα" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Επεξεργασία Καταστήματος" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Επεξεργασία Καταστήματος Ποδηλάτων" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Επεξεργασία Supermarket" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "" @@ -21555,9 +22116,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Περίπτερο" @@ -21565,27 +22126,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Επεξεργασία Περιπτέρου" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Μηχάνημα Πώλησης" @@ -21593,5 +22154,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Επεξεργασία Μηχανήματος Πώλησης" @@ -21599,88 +22160,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Πωλούμενα Προϊόντα" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "χάρτες Μέσων Μαζικής Μεταφοράς" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "εισιτήρια Στάθμευσης" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "φαγητό" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "ποτά" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "γλυκά" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "τσιγάρα" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "φωτογραφίες" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "τροφές ζώων" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "εφημερίδες" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "Παιχνίδια" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "Γραμματόσημα" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "Κάρτες SIM" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "κουπόνια" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "Προφυλακτικά" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Κρεοπωλείο" @@ -21688,9 +22249,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Επεξεργασία Κρεοπωλείου" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Φούρνος" @@ -21698,9 +22259,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Επεξεργασία Φούρνου" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Ανθοπωλείο" @@ -21708,18 +22269,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Επεξεργασία Ανθοπωλείου" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Βιολογικά" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Επεξεργασία Καταστήματος Βιολογικών" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21727,54 +22288,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Υπολογιστές" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Επεξεργασία Καταστήματος Υπολογιστών" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Ηλεκτρονικά" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Ηχοσυστήματα" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Έπιπλα" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Επεξεργασία Καταστήματος Επίπλων" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Είδη Κήπου" @@ -21782,9 +22343,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Σιδηρικά" @@ -21792,9 +22353,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Επεξεργασία Καταστήματος Σιδηρικών" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "" @@ -21802,54 +22363,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Χαρτικά" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Επεξεργασία Χαρτοπωλείου" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Κομμωτήριο" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Επεξεργασία Κομμωτηρίου" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Υποδήματα" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Επεξεργασία Υποδηματοπωλείου" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Παιχνίδια" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Επεξεργασία Καταστήματος Παιχνιδιών" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Στπγνοκαθαριστήριο" @@ -21857,9 +22418,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Επεξεργασία Στεγνοκαθαριστηρίου" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Πλυντήριο" @@ -21867,9 +22428,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Επεξεργασία πλυντηρίου" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "" @@ -21877,28 +22438,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Επεξεργασία Καταστήματος Αθλητικών" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Μετρητά" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Τράπεζα" @@ -21906,14 +22467,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Επεξεργασία Τράπεζας" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "ΑΤΜ" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Συναλλακτήριο" @@ -21921,5 +22482,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Επεξεργασία Συναλλακτηρίου" @@ -21927,15 +22488,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Επεξεργασία ΑΤΜ" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Υγεία" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Ιατροί" @@ -21943,18 +22504,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Επεξεργασία Ιατρών" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Οδοντίατρος" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Επεξεργασία Οδοντιάτρου" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Φαρμακείο" @@ -21962,5 +22523,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Επεξεργασία Φαρμακείου" @@ -21968,9 +22529,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Νοσοκομείο" @@ -21978,10 +22539,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Επεξεργασία Νοσοκομειου" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -21990,5 +22551,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -21997,20 +22558,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Αριθμός Σημείου" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Όνομα Σημείου" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Αριθμός Τηλεφώνου" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)" @@ -22018,5 +22579,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Κτηνιατρίο" @@ -22025,64 +22586,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Επεξεργασία Κτηνιατρίου" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Τοποθεσίες" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Ήπειρος" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Επεξεργασία Ηπείρου" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Χώρα" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Επεξεργασία Χώρας" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Πολιτεία" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Επεξεργασία Πολιτείας" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Περιοχή" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Επεξεργασία Περιοχής" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Περιφέρεια" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Επεξεργασία Περιφέρειας" @@ -22090,15 +22651,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Πόλη" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Επεξεργασία Πόλης" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Κωμόπολη" @@ -22106,10 +22667,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Επεξεργασία Κωμόπολης" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Προάστιο" @@ -22117,25 +22678,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Επεξεργασία Προαστίου" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Χωριό" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Επεξεργασία Χωριού" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "" @@ -22143,5 +22704,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "" @@ -22149,10 +22710,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Νησί" @@ -22160,10 +22721,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Επεξεργασία Νησιού" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22171,5 +22732,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22177,5 +22738,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Είσοδος σπηλαίου" @@ -22183,10 +22744,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Επεξεργασία εισόδου σπηλαίου" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Κορυφή" @@ -22194,10 +22755,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Επεξεργασία κορυφής" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Παγετώνας" @@ -22205,10 +22766,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Επεξεργασία παγετώνα" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Ηφαίστειο" @@ -22216,70 +22777,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Επεξεργασία ηφαιστείου" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Όρια" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Εθνικό" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Επεξεργασία Εθνικού Συνόρου" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Διοικητικό" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Επεξεργασία Διοικητικού Ορίου" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Πολιτικό" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Επεξεργασία Πολιτικού Ορίου" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Πολιτικό" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Επεξεργασία Πολιτικού Ορίου" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Εθνικό πάρκο" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Χρήση γής" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Δένδρο" @@ -22288,15 +22849,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Επεξεργασία δένδρου" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Βοτανικό όνομα" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Άλσος" @@ -22305,5 +22866,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Επεξεργασία άλσους" @@ -22311,17 +22872,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "Κωνοφόρο" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "φυλλοβόλα" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "Μικτό" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Δάσος" @@ -22330,14 +22891,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Επεξεργασία Δάσους" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "" @@ -22345,25 +22906,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22371,10 +22932,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "" @@ -22382,5 +22943,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "" @@ -22388,5 +22949,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "" @@ -22395,45 +22956,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Χωράφι" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Επεξεργασία Χωραφιού" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Αμπελώνας" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Επεξεργασία Αμπελώνα" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Κλήροι" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "" @@ -22441,25 +23002,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Κήπος" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Επεξεργασία Κήπου" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Γρασίδι" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22467,10 +23028,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22478,20 +23039,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Πάρκο" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Επεξεργασία Πάρκου" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Χώρος αναψυχής" @@ -22499,5 +23060,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Επεξεργασία χώρου αναψυχής" @@ -22505,15 +23066,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Οικιστική περιοχή" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Επεξεργασία οικιστικής περιοχής" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Νεκροταφείο" @@ -22521,9 +23082,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Επεξεργασία Νεκροταφείου" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Κοιμητήριο" @@ -22531,39 +23092,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Επεξεργασία χρήσης γης κοιμητηρίου" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Βιομηχανική" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "" @@ -22571,15 +23132,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Στρατιωτικά" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "" @@ -22587,55 +23148,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Εγοτάξιο" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Επεξεργασία εργοταξίου" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "ΧΥΤΑ" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Λατομείο" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Επεξεργασία Λατομείου" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "" @@ -22645,5 +23206,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "" @@ -22652,10 +23213,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "" @@ -22663,5 +23224,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Περιορισμός στροφής" @@ -22670,5 +23231,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Επεξεργασία περιορισμού στροφής" @@ -22676,34 +23237,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Περιορισμός" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "όχι_αριστερή_στροφή" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "όχι_δεξιά_στροφή" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "όχι_ευθεία" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "όχι_αναστροφή" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "μόνο_δεξιά_στροφή" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "μόνο_αριστερή_στροφή" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "μόνο_ευθεία" @@ -22712,15 +23273,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "" @@ -22728,5 +23289,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Διαδρομή" @@ -22735,5 +23296,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Επεξεργασία Διαδρομής" @@ -22741,5 +23302,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Τύπος Διαδρομής" @@ -22811,24 +23372,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "ποδήλατο" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "λεωφορείο" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "δρόμος" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "σκι" @@ -22881,5 +23442,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22888,13 +23449,13 @@ msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "πεζοπορία" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "τραμ" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "παράκαμψη" @@ -22908,10 +23469,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "υπόγειος" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Περιγραφή συμβόλου" @@ -22919,31 +23480,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Δίκτυο" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "προτεινόμενο" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "εναλλακτικό" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "προσωρινό" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "σύνδεση" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Χρώμα (δεκαεξαδικό)" @@ -22952,30 +23513,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "τμήμα διαδρομής" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23186,130 +23747,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23326,98 +23761,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "" @@ -23794,7 +24138,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23858,13 +24202,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23880,5 +24303,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23892,5 +24315,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23911,5 +24334,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "" @@ -23924,5 +24347,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23937,5 +24360,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "όχθη ποταμού" @@ -23949,5 +24372,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "υδατόρρευμα" @@ -23961,5 +24384,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "προβλήτα" @@ -23981,16 +24404,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "υδαταγωγός" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24087,4 +24498,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24153,13 +24571,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24205,6 +24623,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24221,7 +24639,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24244,10 +24662,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24283,11 +24701,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24328,6 +24747,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24341,5 +24760,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "" @@ -24361,5 +24780,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24373,5 +24792,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24379,4 +24798,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24426,7 +24852,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "" @@ -24443,5 +24869,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "πίστα εύκολη" @@ -24456,5 +24882,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "πίστα μεσαία" @@ -24469,5 +24895,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "πίστα προχορημένη" @@ -24482,5 +24908,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24495,5 +24921,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24508,5 +24934,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "πιστα αρχαρίων" @@ -24626,11 +25052,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "" @@ -24644,5 +25070,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "προβλήτα" @@ -24656,5 +25082,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "αγωγός" @@ -24782,12 +25208,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "αναψυχή" @@ -24801,5 +25244,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "" @@ -24837,4 +25280,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24853,4 +25312,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24871,8 +25338,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -24974,10 +25443,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25231,5 +25700,5 @@ #. #. -#. +#. #. color health #. @@ -25375,4 +25844,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25392,23 +25869,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25440,6 +25917,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25500,14 +25977,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "υγεία" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25854,5 +26331,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25875,5 +26351,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "κατάστημα" @@ -25945,8 +26422,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "ξενοδοχείο" @@ -26047,9 +26524,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "τουρισμός" @@ -26137,9 +26614,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "ιστορικό" @@ -26153,5 +26630,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "λατομείο" @@ -26165,5 +26642,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "Χ.Υ.Τ.Α." @@ -26185,5 +26662,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "λεκάνη" @@ -26197,5 +26674,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "δάσος" @@ -26209,5 +26686,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26230,5 +26707,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "" @@ -26242,5 +26719,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "βιομηχανική" @@ -26254,5 +26731,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26266,5 +26743,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26278,5 +26755,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26333,7 +26810,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "στρατιωτική" @@ -26347,5 +26824,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "κοιμητήριο" @@ -26358,5 +26835,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "κορυφή" @@ -26371,5 +26848,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "παγετώνας" @@ -26383,5 +26860,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "ηφαίστειο" @@ -26436,8 +26913,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26451,5 +26928,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "" @@ -26463,5 +26940,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "" @@ -26475,5 +26952,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26487,5 +26964,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "λάσπη" @@ -26499,5 +26976,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "παραλία" @@ -26575,8 +27052,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "διαδρομή" @@ -26624,7 +27101,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "όριο" @@ -26774,11 +27251,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "" @@ -26826,6 +27303,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "διεύθυνση" @@ -27181,63 +27658,76 @@ msgstr "" -#~ msgid "Images for {0}" -#~ msgstr "Εικόνες για {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Ανάγνωση GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση." - -#~ msgid "GPS start: {0}" -#~ msgstr "Αρχή GPS: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "Τέλος GPS: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα" - -#~ msgid "timezone difference: " -#~ msgstr "διαφορά στη ζώνη ώρας: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} μέσα στο ίχνος" - -#~ msgid "Sync clock" -#~ msgstr "Συγχρονισμός ρολογιού" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"." - -#~ msgid "Image" -#~ msgstr "Εικόνα" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί." - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Άνοιγμα εικόνων με το AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "επιλογές osmarender" +#~ msgid "Expected closing parenthesis." +#~ msgstr "Αναμενόταν κλείσιμο παρένθεσης." + +#~ msgid "" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" +#~ msgstr "" +#~ "Ο τρέχων αριθμός αλλαγών υπερβαίνει το μέγιστο αριθμό αλλαγών, τρέχων " +#~ "είναι {0}, μέγιστος είναι {1}" + +#~ msgid "" +#~ "I can take a picture of my GPS receiver.
Can this help?" +#~ msgstr "" +#~ "Μπορώ να βγάλω φωτογραφία τον δέκτη GPS μου.
Μπορεί αυτό να " +#~ "βοηθήσει;" + +#~ msgid "All images" +#~ msgstr "Όλες οι εικόνες" + +#~ msgid "Images with no exif position" +#~ msgstr "Εικόνες χωρίς θέση exif" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Απόκλειση ανάμεσα σε ίχνος και φωτογραφίες: {0}λ {1}δ" + +#~ msgid "Enable proxy server" +#~ msgstr "Ενεργοποίηση διαμεσολαβητή" + +#~ msgid "Anonymous" +#~ msgstr "Anonymous" + +#~ msgid "Proxy server host" +#~ msgstr "Διεύθυνση μεσολαβητή" + +#~ msgid "Proxy server port" +#~ msgstr "Θύρα μεσολαβητή" + +#~ msgid "Proxy server username" +#~ msgstr "Όνομα χρήστη διαμεσολαβητή" + +#~ msgid "Proxy server password" +#~ msgstr "Κωδικός διαμεσολαβητή" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, πιθανόν να λείπουν κάποιες ετικέτες" + +#~ msgid "Preparing..." +#~ msgstr "Προετοιμασία..." + +#~ msgid "Uploading..." +#~ msgstr "Αποστολή..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Λανθασμένος κωδικός ή όνομα χρήστη" + +#~ msgid "Enter Password" +#~ msgstr "Εισάγετε κωδικό" + +#~ msgid "Login" +#~ msgstr "Είσοδος" + +#~ msgid "Interpolation" +#~ msgstr "Παρεμβολή" + +#~ msgid "Optional" +#~ msgstr "Προαιρετικό" + +#~ msgid "Shop" +#~ msgstr "Κατάστημα" + +#~ msgid "aqueduct" +#~ msgstr "υδαταγωγός" #~ msgid "" @@ -27298,7 +27788,4 @@ #~ msgstr "Μετακίνηση" -#~ msgid "File could not be found." -#~ msgstr "Το αρχείο δεν βρέθηκε." - #~ msgid "unnamed" #~ msgstr "χωρίς όνομα" @@ -27330,4 +27817,22 @@ #~ msgid "name" #~ msgstr "όνομα" + +#~ msgid "Images for {0}" +#~ msgstr "Εικόνες για {0}" + +#~ msgid "GPS start: {0}" +#~ msgstr "Αρχή GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα" + +#~ msgid "GPS end: {0}" +#~ msgstr "Τέλος GPS: {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Ανάγνωση GPX..." + +#~ msgid "Image" +#~ msgstr "Εικόνα" #~ msgid "" @@ -27395,4 +27900,19 @@ #~ msgstr "Επίπεδο δεδομένων" +#~ msgid "Time entered could not be parsed." +#~ msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί." + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)" + +#~ msgid "Sync clock" +#~ msgstr "Συγχρονισμός ρολογιού" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"." + #~ msgid "Login name (email) to the OSM account." #~ msgstr "Όνομα χρήστη (email) για τον λογαριασμό OSM." @@ -27452,4 +27972,10 @@ #~ msgid "JOSM Online Help" #~ msgstr "Online βοήθεια του JOSM" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}" #~ msgid "" @@ -27498,4 +28024,10 @@ #~ msgstr "Χρήση προεπιλογής \"{0}\"" +#~ msgid "No images with readable timestamps found." +#~ msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση." + +#~ msgid "{0} within the track." +#~ msgstr "{0} μέσα στο ίχνος" + #~ msgid "Tagging preset source" #~ msgstr "Πηγή προεπιλογών ετικετών" @@ -27509,4 +28041,7 @@ #~ msgid "Authors: {0}" #~ msgstr "Συγγραφείς: {0}" + +#~ msgid "osmarender options" +#~ msgstr "επιλογές osmarender" #~ msgid "requested: {0}" @@ -27592,4 +28127,7 @@ #~ "και ξεκινήστε νέο επίπεδο στην νέα ζώνη." +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS" + #~ msgid "" #~ "Server returned internal error. Try a reduced area or retry after waiting " @@ -27602,4 +28140,7 @@ #~ msgstr "Υπήρχαν συγκρούσεις στην εισαγωγή" +#~ msgid "timezone difference: " +#~ msgstr "διαφορά στη ζώνη ώρας: " + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Προσθέστε είτε το site-josm.xml ή τις Σελίδες Βίκι." @@ -27662,4 +28203,7 @@ #~ msgstr "Επεξεργαστής Σχέσεων: {0}" +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)" + #~ msgid "Delete and Download" #~ msgstr "Διαγραφή και Λήψη" @@ -27699,7 +28243,4 @@ #~ msgid "Help / About" #~ msgstr "Βοήθεια / Σχετικά" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία εργασία για λήψη" #~ msgid "" @@ -27744,4 +28285,7 @@ #~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή." +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Άνοιγμα εικόνων με το AgPifoJ..." + #~ msgid "Continue anyway" #~ msgstr "Συνέχεια έτσι κι αλλιώς" Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 19198) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 19199) @@ -6,9 +6,10 @@ # Dirk Stöcker , 2008. # Bruce Cowan , 2009. +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" "PO-Revision-Date: 2009-11-24 13:31+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -18,38 +19,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Creating main GUI" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoring malformed URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -61,21 +62,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -96,17 +97,8 @@ msgstr "Warning" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoring malformed file URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Could not read file ''{0}''.
Error is:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -114,8 +106,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Could not read file ''{0}''.
Error is:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -123,10 +124,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -138,9 +139,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -149,6 +151,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -203,8 +205,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -272,5 +274,5 @@ msgstr "About JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -281,5 +283,5 @@ "page for OSM primitive will probably fail. API base URL is: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -290,5 +292,5 @@ "user will probably fail. API base URL is: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -299,15 +301,20 @@ "screen with browser windows
and take some time to finish." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Continue" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -316,29 +323,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -355,5 +363,9 @@ msgstr "Cancel" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Please select at least one already uploaded node, way, or relation." @@ -369,5 +381,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Merge" @@ -387,15 +399,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Add Node..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Add a node by entering latitude and longitude." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -411,22 +423,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Edit: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Enter the coordinates for the new node." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Use decimal degrees." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative values denote Western/Southern hemisphere." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -435,5 +447,5 @@ msgstr "Latitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -442,28 +454,29 @@ msgstr "Longitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -475,9 +488,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -498,18 +511,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -521,5 +534,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -541,6 +554,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -587,5 +600,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflict" @@ -622,14 +635,15 @@ msgstr "No conflicts to zoom to" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Close open changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Closes open changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -639,21 +653,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "File: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "There are no open changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "No open changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Downloading open changesets ..." @@ -740,11 +754,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -822,16 +837,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -867,5 +887,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplicate" @@ -908,10 +928,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Export to GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Export the data to GPX file." @@ -926,12 +946,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -956,8 +976,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -968,10 +988,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -984,17 +1004,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1031,22 +1051,27 @@ msgstr "Display object information about OSM nodes, ways, or relations." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Join overlapping Areas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Joins areas that overlap each other" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Please select at least one closed way the should be joined." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Only up to two areas can be joined at the moment." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" is not closed and therefore can't be joined." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1059,38 +1084,34 @@ "Are you really sure to continue?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Please abort if you are not sure" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Please select at least one closed way the should be joined." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "No intersection found. Nothing was changed." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Added node on all intersections" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Delete Ways that are not part of an inner multipolygon" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Fix relations" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Joined self-overlapping area" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Joined overlapping areas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1100,33 +1121,33 @@ "verify no errors have been introduced." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Enter values for all conflicts." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Solve Conflicts" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Fix tag conflicts" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Removed Element from Relations" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Join Areas: Remove Short Ways" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Closed Way" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Remove tags from inner ways" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Join Areas Function" @@ -1289,5 +1310,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Cannot move objects outside of the world." @@ -1367,28 +1388,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Orthogonalise Shape" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Move nodes so all angles are 90 or 270 degree" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1397,9 +1418,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1411,16 +1432,16 @@ "projection to get rid of this warning.
Do you want to continue?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 -msgid "Usage" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 -msgid "Selected Elements cannot be orthogonalized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 msgid "Orthogonalize" msgstr "Orthogonalise" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 +msgid "Usage" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 +msgid "Selected Elements cannot be orthogonalized" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1493,18 +1514,18 @@ msgstr "Could not rename file ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Reverse Ways" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Reverse the direction of all selected ways." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Please select at least one way." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Reverse ways" @@ -1513,10 +1534,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Save" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Save the current data." @@ -1573,10 +1594,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Save As..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Save the current data to a new file." @@ -1620,6 +1641,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1653,5 +1673,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1716,5 +1736,5 @@ "middle of the way.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1724,5 +1744,5 @@ "should verify this and correct it when necessary." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1732,5 +1752,5 @@ "this and correct it when necessary." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1764,45 +1784,45 @@ msgstr "This node is not glued to anything else." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "None of these nodes are glued to anything else." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "None of this way's nodes are glued to anything else." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "The current selection cannot be used for unglueing." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Select either:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* One tagged node, or" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* One node that is used by more than one way, or" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* One way that has one or more nodes that are used by more than one way, or" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* One way that has one or more nodes that are used by more than one way, or" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" "* One way and one or more of its nodes that are used by more than one way." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1816,9 +1836,9 @@ "own copy and all nodes will be selected." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Unglued Node" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1826,5 +1846,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1859,10 +1879,10 @@ msgstr "Unselect All (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Update data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1870,23 +1890,23 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "Download data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "No current dataset found" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1894,30 +1914,26 @@ "Updates the currently selected objects from the server (re-downloads data)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Update Selection" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selection empty" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Upload data" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1928,5 +1944,5 @@ "resolve them first." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1934,145 +1950,7 @@ msgstr "No changes to upload." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nothing to upload. Get some data first." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synchronize entire dataset" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Conflicts detected" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Changeset closed" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Updating primitive" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Uploading data for layer ''{0}''" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2207,9 +2085,9 @@ msgstr "Downloaded GPX Data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Downloading data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2218,5 +2096,5 @@ "Ignoring exception because download has been cancelled. Exception was: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "No data found in this area." @@ -2292,7 +2170,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2309,58 +2187,52 @@ "when deleting a way. Ctrl: delete referring objects." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Draw" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Draw nodes" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Mode: Draw Focus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "selected" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Cannot add a node outside of the world." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Add node" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Add node into way" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Connect existing way to node" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Add a new node to an existing way" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Add node into way and connect" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Create new node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Select node under cursor." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2369,14 +2241,14 @@ msgstr[1] "Insert new node into {0} ways." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Start new way from last node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Continue way from last node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Finish drawing." @@ -2417,18 +2289,19 @@ "+release to synchronise audio at that point." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Select" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Select, move and rotate objects" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2437,17 +2310,17 @@ msgstr[1] "Add and move a virtual new node to {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Move elements" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Move them" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Undo move" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2460,13 +2333,13 @@ "Really move them?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Always move and don't show dialogue again" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Release the mouse button to select the objects in the rectangle." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2474,9 +2347,9 @@ "Release the mouse button to stop moving. Ctrl to merge with nearest node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Release the mouse button to stop rotating." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2488,5 +2361,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zoom" @@ -2510,5 +2383,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Search for objects." @@ -2599,7 +2472,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - all objects changed by user" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2608,8 +2480,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - object with given number of nodes" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:... - object with given number of nodes" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2617,21 +2499,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - all changed objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - all selected objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - all incomplete objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - all untagged objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2639,5 +2527,5 @@ "child expr - all children of objects matching the expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2645,19 +2533,19 @@ "parent expr - all parents of objects matching the expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Use | or OR to combine with logical or" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Use \" to quote operators (e.g. if key contains :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Use ( and ) to group expressions" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2665,55 +2553,55 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "Submit filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Start Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "No match found for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nothing added to selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nothing removed from selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nothing found in selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Found {0} matches" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2726,40 +2614,43 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "Key cannot be empty when tag operator is used. Sample use: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Unexpected token: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Missing arguments for or." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Missing argument for not." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Expected closing bracket." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Missing arguments for or." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2768,9 +2659,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Wrong number of parameters for nodes operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2781,7 +2672,12 @@ "nodes or range, for example nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Incorrect value of id operator: {0}. Number is expected." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Incorrect value of id operator: {0}. Number is expected." @@ -2815,43 +2711,29 @@ msgstr "Error while communicating with server." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Precondition Violation" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "API Capabilities Violation" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " -"length {2}. Values length is {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Precondition Violation" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2966,5 +2848,5 @@ msgstr "Set {0}={1} for {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2981,5 +2863,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Double conflict" @@ -3083,4 +2965,19 @@ msgstr "Resolve conflicts in deleted state in {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3194,5 +3091,5 @@ msgstr "Apply?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3276,15 +3173,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "Warning: failed to persist preferences to ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "Malformed config file at lines {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3295,5 +3192,5 @@ "isn't a directory." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3304,5 +3201,5 @@ "isn't a directory." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3313,5 +3210,5 @@ "preference directory: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3322,5 +3219,5 @@ "preference directory: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3329,5 +3226,5 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3338,5 +3235,5 @@ "file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3347,5 +3244,5 @@ "to default: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3356,5 +3253,5 @@ "
and creating a new default preference file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3365,10 +3262,10 @@ "default: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3376,24 +3273,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Preferences stored on {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Could not upload preferences. Reason: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Could not load preferences from server." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3402,5 +3299,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3431,5 +3328,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3451,31 +3348,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "W" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Changeset {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3483,5 +3373,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3492,27 +3382,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3520,5 +3410,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3530,5 +3420,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3536,25 +3426,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "H" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "Text" #. column header: apply filter for children -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "C" msgstr "C" #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "I" msgstr "I" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "M" @@ -3562,43 +3452,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "R" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "A" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "D" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "expected id >= 0. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "a primitive with id=0 can't be invisible" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "ID > 0 expected. Got {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "version > 0 expected. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "parameter ''{0}'' >= 0 expected, got ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3606,5 +3508,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3634,10 +3536,6 @@ "multiple values" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3645,7 +3543,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3660,5 +3558,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3676,146 +3574,138 @@ msgstr "parameter {0} not in range 0..{1}, got {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Area style way is not closed." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "multipolygon way ''{0}'' is not closed." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Deleted member ''{0}'' in relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Way ''{0}'' with less than two points." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "More than one \"from\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "More than one \"to\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "More than one \"via\" found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Unknown role ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Unknown member type for ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "No \"from\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "No \"to\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "No \"via\" node or way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "The \"from\" way doesn't start or end at a \"via\" node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "The \"to\" way doesn't start or end at a \"via\" node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "The \"from\" way doesn't start or end at the \"via\" way." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "The \"to\" way doesn't start or end at the \"via\" way." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Style for restriction {0} not found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersection between ways ''{0}'' and ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Inner way ''{0}'' is outside." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "No useful role ''{0}'' for Way ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-Way ''{0}'' in multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "No outer way for multipolygon ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Style for inner way ''{0}'' equals multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Style for outer way ''{0}'' mismatches." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "untagged" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Warning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "inactive" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "selected" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3824,6 +3714,6 @@ msgstr[1] "nodes" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3832,7 +3722,8 @@ msgstr[1] "ways" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3841,21 +3732,37 @@ msgstr[1] "relations" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "untagged way" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "incomplete way" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "background" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "highlight" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "untagged" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "text" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3998,5 +3905,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "railway" @@ -4012,7 +3919,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4028,4 +3935,10 @@ msgstr[1] "{0} members" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Changeset {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4057,6 +3970,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Conflict" @@ -4070,7 +3983,7 @@ msgstr "Object deleted" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4155,74 +4068,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Username" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Password" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Show this help" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Standard unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Download the bounding box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Open file (as raw gps, if .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Download the bounding box as raw gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Select with the given search" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Launch in maximised mode" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Reset the preferences to default" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Set the language." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "options provided as Java system properties" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "Change the folder for all user settings" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4234,9 +4147,9 @@ " Java option to increase the maximum size of allocated memory" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "examples" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4246,36 +4159,36 @@ "some data before --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Instead of --download= you may specify osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Activating updated plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Loading early plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Setting defaults" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Loading plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Preference setting {0} has been removed since it is no longer used." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4290,22 +4203,22 @@ msgstr "Edit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Tools" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Presets" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4313,5 +4226,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Audio" @@ -4392,13 +4305,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "User:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "layer not in list." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4432,5 +4346,5 @@ msgstr "Initialising" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4438,6 +4352,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4446,5 +4360,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4453,5 +4367,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4460,25 +4374,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "Pos." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4486,9 +4400,9 @@ msgstr "Role" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4520,11 +4434,11 @@ msgstr "role {0} is not participating in compare pair {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Properties" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4533,6 +4447,6 @@ msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4540,6 +4454,6 @@ msgstr "Nodes" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4547,23 +4461,23 @@ msgstr "Members" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "No pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags({0} conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Nodes(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4571,17 +4485,17 @@ "Merged node list frozen. No pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Nodes(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Members(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4591,21 +4505,21 @@ "relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Members(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "Pending conflicts in the member list of this relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "No pending property conflicts" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Properties(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Pending property conflicts to be resolved" @@ -4637,22 +4551,22 @@ msgstr "item {0} not found in list" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "lock scrolling" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Compare " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "My version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "List of elements in my dataset, i.e. the local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4660,5 +4574,5 @@ msgstr "Merged version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4668,30 +4582,30 @@ "decisions are applied." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Their version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "List of elements in their dataset, i.e. the server dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> top" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Copy my selected nodes to the start of the merged node list" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> bottom" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "Copy my selected elements to the end of the list of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4701,5 +4615,5 @@ "merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4709,5 +4623,5 @@ "merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4715,9 +4629,9 @@ "Copy their selected element to the start of the list of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "Copy their selected elements to the end of the list of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4727,5 +4641,5 @@ "of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4735,23 +4649,23 @@ "merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Up" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Move up the selected elements by one position" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Down" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Move down the selected entries by one position" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4762,27 +4676,27 @@ msgstr "Remove" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "Remove the selected entries from the list of merged elements" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Freeze" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Freeze" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Freeze the current list of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Unfreeze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Unfreeze the list of merged elements and start merging" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4792,5 +4706,5 @@ "Click {0} to start merging my and their entries" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4801,5 +4715,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4808,5 +4722,5 @@ msgstr[1] "My version ({0} entries)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4815,5 +4729,5 @@ msgstr[1] "Merged version ({0} entries)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4822,5 +4736,5 @@ msgstr[1] "Their version ({0} entries)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4832,5 +4746,5 @@ "adjustment." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5079,10 +4993,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5092,10 +5006,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5180,9 +5094,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Apply" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5190,6 +5104,6 @@ msgstr "none" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "all" @@ -5278,7 +5192,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5288,6 +5202,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5395,4 +5309,58 @@ msgstr "Show tags with conflicts only" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Delete selected objects." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Changeset" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "Load the list of your open changesets from the server" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +#, fuzzy +msgid "Select all objects assigned to the currently selected changesets" +msgstr "Close the currently selected open changeset" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Download" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Download map data from the OSM server." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Close the selected open changesets" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Show info" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Open an editor for the selected relation" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5406,12 +5374,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5429,18 +5397,18 @@ msgstr "Command Stack: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Resolve" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "Open a merge dialogue of all selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5449,25 +5417,25 @@ "Set the selected elements on the map to the selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancel conflict resolution and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Apply resolved conflicts and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Apply Resolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "Close anyway" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "Continue resolving" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5484,26 +5452,26 @@ "{1} to return to resolving conflicts." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "Conflict not resolved completely" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Resolve conflicts" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Resolve conflicts for ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "Filter objects and hide/disable them." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5514,41 +5482,41 @@ msgstr "Add" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "Add filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "Edit filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "Delete filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "Move filter up." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "Move filter down." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "Enable filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "Hide elements" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "Apply also for children" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "Inverse filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "Filter mode" @@ -5587,5 +5555,5 @@ msgstr "Display the history of the selected objects." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "Dialog not created yet. Invoke createInstance() first" @@ -5600,34 +5568,34 @@ msgstr "Open a list of all loaded layers." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Delete the selected layer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Show/Hide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Toggle visible state of the selected layer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Activate" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Activate the selected layer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Merge this layer into another layer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Move the selected layer one row up." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Move the selected layer one row down." @@ -5637,5 +5605,179 @@ msgstr "Information about layer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relations" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Open a list of all relations." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relations: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Open an editor for the selected relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Delete the selected relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Create a new relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +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" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "Set the current selection to the list of selected relations" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Current Selection" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Open a selection list window." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Zoom to selected element(s)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Zoom to selection" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Selection" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Selection: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Undock the panel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Close this panel. You can reopen it with the buttons in the left toolbar." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Click to minimise/maximise the panel content" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Authors" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Open a list of people working on the selected objects." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} Author" +msgstr[1] "{0} Autori" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "Select primitives submitted by this user" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "Launches a browser with information about the user" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" +"Warning: only launching info browsers for the first {0} of {1} selected users" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "Missing encoding" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Author" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Objects" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "incomplete" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "closed way" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Downloading open changesets ..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5644,22 +5786,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Change values?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5668,5 +5810,5 @@ msgstr[1] "Change properties of up to {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5675,230 +5817,71 @@ msgstr[1] "This will change up to {0} objects." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Please select a key" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Please select a value" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Please select the objects you want to change properties for." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Properties/Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Properties for selected objects." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Member Of" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Add Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Properties: {0} / Memberships: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Properties / Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Change relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Delete from relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Really delete selection from relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Delete the selected key in all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Delete Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Add a new key/value pair to all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Edit the value of the selected key for all objects" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relations" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Open a list of all relations." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relations: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Open an editor for the selected relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Delete the selected relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Create a new relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -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" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "Set the current selection to the list of selected relations" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Current Selection" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Open a selection list window." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Zoom to selected element(s)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Zoom to selection" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Selection" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Selection: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Undock the panel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Close this panel. You can reopen it with the buttons in the left toolbar." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Click to minimise/maximise the panel content" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Authors" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Open a list of people working on the selected objects." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} Author" -msgstr[1] "{0} Autori" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "Select primitives submitted by this user" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Show info" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "Launches a browser with information about the user" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" -"Warning: only launching info browsers for the first {0} of {1} selected users" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "Missing encoding" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Author" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Objects" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5962,19 +5945,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Download all incomplete ways and nodes in relation" -msgstr[1] "Download all incomplete ways and nodes in relation" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Download relation members" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Downloading relation {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -5992,14 +5974,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Apply Role" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Select primitives for selected relation members" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -6011,14 +5991,14 @@ "
How do you want to proceed with circular dependencies?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "Remove them, clean up relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "Ignore them, leave relation as is" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -6031,9 +6011,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "Multiple members referring to same primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -6046,5 +6026,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -6052,5 +6032,5 @@ "Add all primitives selected in the current dataset before the first member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -6058,5 +6038,5 @@ "Add all primitives selected in the current dataset after the last member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -6066,5 +6046,5 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -6074,15 +6054,15 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "Relation Editor: Remove Selected" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" @@ -6090,5 +6070,5 @@ "Select relation members which refer to primitives in the current selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6099,70 +6079,69 @@ "selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "Select primitives for selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "Sort the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Sport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "Sort" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "Relation Editor: Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "Relation Editor: Move Up" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "Relation Editor: Move Down" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 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:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "Relation Editor: Remove" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "Delete the currently edited relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "Yes, create a conflict and close" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "No, continue editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6174,9 +6153,9 @@ "conflict and close the editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "Conflict in data" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6187,49 +6166,47 @@ "
Please resolve this conflict first, then try again." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "Apply the current updates" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "Apply the updates and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "Cancel the updates and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Add an empty tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Download relation members" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "Relation Editor: Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "Download relation members" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 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:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Apply Role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6242,34 +6219,34 @@ "new role?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "Yes, apply it" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "No, don't apply" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "Confirm empty role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 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/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "Zoom to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "Zooming disabled because layer of this relation is not active" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "Zooming disabled because there is no selected member" @@ -6382,10 +6359,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "Name of location" @@ -6395,5 +6372,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6479,9 +6456,4 @@ msgid "Download Area" msgstr "Download Area" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Download" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6780,6 +6752,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6792,6 +6762,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -7062,4 +7030,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7282,5 +7254,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7323,116 +7295,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Name" @@ -7456,15 +7428,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7638,10 +7610,10 @@ msgstr "Reload the history from the server" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "history not initialised yet. Failed to set reference primitive." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7650,5 +7622,5 @@ "Failed to set reference. Reference ID {0} does not match history ID {1}." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7657,9 +7629,9 @@ "failed to set reference. reference version {0} not available in history" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "history not initialised yet. Failed to set current primitive." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7774,6 +7746,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "unknown" @@ -7796,13 +7768,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Changeset info" msgstr "Changeset info" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Launch browser with information about the changeset" msgstr "Launch browser with information about the changeset" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7837,4 +7809,130 @@ msgstr "Version" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synchronize entire dataset" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Conflicts detected" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Changeset closed" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Provide a brief comment for the changes you are uploading:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7853,39 +7951,150 @@ msgstr "No open changeset" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Open a new changeset" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "Open a new changeset and use it in the next upload" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Updating changeset..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Upload data to an already opened changeset" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "Close changeset after upload" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "Select to close the changeset after the next upload" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "Load the list of your open changesets from the server" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "Close the currently selected open changeset" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "Please select the changesets you want to close" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "Open changesets" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Close changesets" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "Close the selected open changesets" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "Cancel closing of changesets" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Closing changeset" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "Closing changeset {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +#, fuzzy +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "Warning: failed to put a dialog always on top. Exception was: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Save user and password (unencrypted)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Please enter a user name" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Please enter tags about your trace." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Warning: The password is transferred unencrypted." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Athletics" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Reached a junction" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "Launch a file chooser to select a file" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "Select filename" @@ -7955,17 +8164,17 @@ msgstr "Saving layer to ''{0}'' ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "Unsaved changes - Save/Upload before exiting?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "Unsaved changes - Save/Upload before deleting?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "Uploading and saving modified layers ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7982,9 +8191,9 @@ "discard the modifications.
Layers with conflicts:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "Unsaved data and conflicts" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -8003,9 +8212,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "Unsaved data and missing associated file" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -8026,50 +8235,50 @@ "changes.
Layers with non-writable files:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "Unsaved data non-writable files" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "Close this dialogue and resume editing in JOSM" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Discard and Exit" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "Exit JOSM without saving. Unsaved changes are lost." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "Discard and Delete" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "Delete layers without saving. Unsaved changes are lost." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "Save/Upload and Exit" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "Save/Upload and Delete" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "Save/Upload layers before deleting. Unsaved changes are not lost." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "Preparing layer ''{0}'' for upload ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -8079,5 +8288,5 @@ "cancelled or has failed." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "Incomplete upload and/or save" @@ -8150,40 +8359,387 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Upload" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Settings" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "Tags of new changeset" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "Open a new changeset and use it in the next upload" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "advanced" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Configure available plugins." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Uploading data for layer ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Upload Changes" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "Upload the changed primitives" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Please enter a comment for this upload changeset (min. 3 characters)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "Illegal upload comment" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "Cancel the upload and resume editing" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Tags of changeset {0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "Preparing primitives to upload ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, fuzzy, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +"Version {0} created on {1}" +msgstr[1] "" +"Version {0} created on {1}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Uploading data for layer ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "Continue uploading" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "About" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Continue uploading" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Select objects to upload" +msgstr[1] "Select objects to upload" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Changeset info" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" +"Mark modified objects from the current selection to " +"be uploaded to the server." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" +"Mark locally deleted objects to be deleted on the " +"server." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "Select objects to upload" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "Cancel uploading" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Please select the row to delete." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "Open a new changeset and use it in the next upload" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Objects to add:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Objects to modify:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Objects to delete:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8192,5 +8748,5 @@ msgstr[1] "{0} objects to add:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8199,5 +8755,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8206,216 +8762,37 @@ msgstr[1] "{0} objects to delete:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Upload Changes" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "Upload the changed primitives" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "Please enter a comment for this upload changeset (min. 3 characters)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "Illegal upload comment" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Please enter the desired coordinates first." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "Cancel the upload and resume editing" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Provide a brief comment for the changes you are uploading:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "Open a new changeset" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "Open a new changeset and use it in the next upload" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "Use an open changeset" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Upload data to an already opened changeset" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "Close changeset after upload" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "Select to close the changeset after the next upload" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Tags of changeset {0}" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "Load the list of your open changesets from the server" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "Close the currently selected open changeset" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "Changeset ID > 0 expected. Got {0}." - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "Preparing primitives to upload ..." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" -"Mark modified objects from the current selection to " -"be uploaded to the server." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" -"Mark locally deleted objects to be deleted on the " -"server." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "Select objects to upload" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "Cancel uploading" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "Continue uploading" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "Warning: failed to persist preferences to ''{0}''" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Upload all changes in one request" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "Bad Request" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} metres" -msgstr[1] "{0} metres" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Please enter a filter string." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, fuzzy, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "File ''{0}'' is not writable. Please enter another file name." - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps point" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Customise line drawing" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Use global settings." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Draw lines between points for this layer." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Do not draw lines between points for this layer." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Select line drawing options" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8423,5 +8800,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8430,5 +8807,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8510,5 +8887,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Description" @@ -8540,10 +8917,10 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Convert to data layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8553,12 +8930,12 @@ "
If you want to upload traces, look here:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8567,29 +8944,29 @@ msgstr "Converted from: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Download from OSM along this track" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Download everything within:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} metres" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Maximum area per request:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} sq km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8600,9 +8977,9 @@ "wish
to continue?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "No GPX track available in layer to associate audio with." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8612,5 +8989,5 @@ "the end were omitted or moved to the start." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8620,23 +8997,23 @@ "time were omitted." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Data Layer {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "outside downloaded area" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8645,5 +9022,5 @@ msgstr[1] "There were {0} conflicts detected." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8657,5 +9034,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8668,11 +9045,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8681,36 +9058,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "unset" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "API version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Convert to GPX layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8720,5 +9097,5 @@ "
If you want to upload traces, look here:" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8727,5 +9104,5 @@ msgstr[1] "tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8733,5 +9110,5 @@ msgstr[1] "points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8740,5 +9117,5 @@ msgstr[1] "a track with {0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8747,5 +9124,5 @@ msgstr[1] "{0} consists of {1} tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8754,24 +9131,24 @@ msgstr[1] "{0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX Files (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "File {0} is loaded yet under the name \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Error while parsing {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Could not read \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8783,34 +9160,34 @@ "on the photo and select a timezone

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Photo time (from exif):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Gps time (read from the above photo): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "I'm in the timezone of: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "No date" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Open an other photo" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synchronise time from a photo of the GPS receiver" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8820,70 +9197,159 @@ "Please use the requested format" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Invalid date" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX track: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Open another GPX trace" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Auto-Guess" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Update position for: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Timezone: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Offset:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"I can take a picture of my GPS receiver.
Can this help?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Update position for: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "All images" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Images with no exif position" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Not yet tagged images" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Nothing selected!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Matched {0} of {1} photos to GPX track." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Correlate images with GPX track" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Correlate" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-Guess" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Invalid timezone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Invalid offset" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Tracing" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Timezone: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Minutes: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Seconds: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Time difference of {0} days)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "Matching photos to track failed" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Adjust timezone and offset" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "The selected photos don't contain time information." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Photos don't contain time information" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"The selected GPX track doesn't contain timestamps. Please select another one." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX Track has no time information" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "You should select a GPX track" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "No selected GPX track" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8894,9 +9360,5 @@ "Expected format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Invalid timezone" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8907,137 +9369,56 @@ "Expected format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Invalid offset" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Found {0} matches of {1} in GPX track {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX Track loaded" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "The selected photos don't contain time information." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Photos don't contain time information" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"The selected GPX track doesn't contain timestamps. Please select another one." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX Track has no time information" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Timezone: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minutes: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Seconds: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Matched {0} of {1} photos to GPX track." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Time difference of {0} days)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Offset between track and photos: {0}m {1}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Matching photos to track failed" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Adjust timezone and offset" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Default Values" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Extracting GPS locations from EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Starting directory scan" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Read photos..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Reading {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Unable to get canonical path for directory {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Scanning directory {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Found null file in directory {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Error while getting files from directory {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Geotagged Images" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Correlate to GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -9045,52 +9426,100 @@ msgstr[1] "images" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} were found to be gps tagged." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Always move and don't show dialogue again" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "File could not be found." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "No image" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Loading {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Error on file {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Display geotagged photos" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Previous" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Previous image" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Webpage: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Remove photo from layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Delete from relation" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Next" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Next image" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Centre view" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Zoom best fit and 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -9101,5 +9530,5 @@ "Altitude: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9203,4 +9632,12 @@ msgid "Error displaying URL" msgstr "Error displaying URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9427,7 +9864,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "All" @@ -9496,6 +9932,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Bicycle" @@ -9893,31 +10329,94 @@ msgstr "The projection {0} could not be activated. Using Mercator" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Enable proxy server" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonymous" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Hostel" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Port:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Password" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Proxy Settings" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Proxy server host" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Proxy server port" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Proxy server username" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Proxy server password" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "The base URL for the OSM server (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "Login name (e-mail) to the OSM account." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Login password to the OSM account. Leave blank to not store any password." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Base Server URL" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "OSM username (e-mail)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM password" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10222,5 +10721,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10230,13 +10729,13 @@ msgstr[1] "Remove old keys from up to {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "Add a new tag" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "Delete the selection in the tag table" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10244,18 +10743,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Optional Attributes:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "closed way" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Unknown type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10266,16 +10765,16 @@ msgstr "Could not read tagging preset source: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Error parsing {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Elements of type {0} are supported." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10284,18 +10783,18 @@ msgstr[1] "Change {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Nothing selected!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Selection unsuitable!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Apply Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Change Properties" @@ -10324,4 +10823,14 @@ msgstr "Downloading points {0} to {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +#, fuzzy +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" +"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got " +"''{1}''" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10337,12 +10846,68 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, possibly some missing tags." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Preparing data..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, fuzzy, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" +"unexpected format of new version of modified primitive ''{0}'', got ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "unexpected column number {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10445,16 +11010,16 @@ msgstr "Parse error: invalid document structure for gpx document" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "Unknown mode {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "no primitive with id {0} in local dataset. Can't infer primitive type" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10464,40 +11029,40 @@ msgstr "Downloading OSM data..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Fetching node with id {0} from ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Fetching way with id {0} from ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Fetching relation with id {0} from ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Server replied with response code 404 for id {0}. Skipping." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Fetching a package of nodes from ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Fetching a package of ways from ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Fetching a package of relations from ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10507,10 +11072,10 @@ "for each primitive" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Downloading points {0} to {1}..." -msgstr[1] "Downloading points {0} to {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10547,34 +11112,32 @@ msgstr "NMEA import failure!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, fuzzy, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." msgstr "preference ''{0}'' missing. Can't initialize OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "This version of JOSM is incompatible with the configured server." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"It supports protocol versions 0.5 and 0.6, while the server says it supports " -"{0} to {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Communications with {0} established using protocol version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "unexpected format of id replied by the server, got ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10583,66 +11146,77 @@ "unexpected format of new version of modified primitive ''{0}'', got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "Creating changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Successfully opened changeset {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "Changeset ID > 0 expected. Got {0}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Updating changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "Updating changeset {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Closing changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "No changeset present for diff upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Preparing..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Uploading..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Preparing data..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Change {0} object" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "Waiting 10 seconds ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "OK - trying again." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starting retry {0} of {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10669,4 +11243,14 @@ msgid "Invalid bz2 file." msgstr "Invalid bz2 file." + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10677,5 +11261,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10702,5 +11286,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10708,5 +11292,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10719,5 +11303,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10728,61 +11312,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Incorrect password or username." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Warning: The password is transferred unencrypted." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Save user and password (unencrypted)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Enter Password" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Login" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "The base URL for the OSM server (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "Login name (e-mail) to the OSM account." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Login password to the OSM account. Leave blank to not store any password." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Base Server URL" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "OSM username (e-mail)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM password" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10879,5 +11408,12 @@ msgstr "File \"{0}\" does not exist" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10886,38 +11422,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10925,19 +11461,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Incomplete specification with ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Illegal object with id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10947,8 +11483,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10958,25 +11494,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10984,5 +11536,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10991,5 +11543,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10997,5 +11549,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -11004,13 +11556,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Prepare OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -11033,21 +11585,33 @@ msgstr "Downloading referring relations ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Downloading open changesets ..." +msgstr[1] "Downloading open changesets ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Downloading open changesets ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -11066,7 +11630,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "unexpected value of parameter \"index\". Got {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -11075,9 +11639,5 @@ msgstr "Failed to open connection to API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11129,7 +11689,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "unexpected value of parameter \"index\". Got {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 @@ -11137,5 +11697,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -11145,4 +11705,9 @@ msgid "Uploading data ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Deleted or moved primitives" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11184,12 +11749,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Delete {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Error deleting plugin file: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11331,9 +11896,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "no description available" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "More details" @@ -11465,4 +12030,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "unexpected value of parameter \"index\". Got {0}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''." + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11771,6 +12351,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Upload Traces" @@ -11856,5 +12436,5 @@ msgstr "Uploading GPX Track" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Uploads traces to openstreetmap.org" @@ -11865,5 +12445,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Address Interpolation" @@ -11878,11 +12458,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Odd" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Even" @@ -11893,24 +12470,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Number" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "natural" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "Activate" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Rental" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11928,7 +12501,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "inner segment" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -12041,5 +12613,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -12101,21 +12673,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Select commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Choose from..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12127,13 +12699,13 @@ "Would you like to restore F11 for grab action ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "Restore grab shortcut F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM is stopped for the change to take effect." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12159,17 +12731,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Enable automatic caching." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Max. cache size (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12187,18 +12759,18 @@ "by this plugin." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "French cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Value of key \"source\" when autosourcing is enabled" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12208,5 +12780,5 @@ "preferences." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12216,52 +12788,49 @@ "Useful for texts on dark backgrounds." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Allows multiple layers stacking" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Set WMS layers transparency. Right is opaque, left is transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Draw a rectangle around downloaded data from WMS server." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Grab smaller images (higher quality but use more memory)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Fixed size square (default is 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fixed size (from 25 to 1000 metres)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Oldest files are automatically deleted when this size is exceeded" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Auto-tag source added:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Add \"source=...\" to elements?" @@ -12465,5 +13034,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Location" @@ -12663,5 +13232,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "No data loaded." @@ -12683,9 +13252,9 @@ msgstr "Convert to GPX layer with anonymised time" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "edit gpx tracks" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "EditGpx" @@ -13074,7 +13643,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "water" @@ -13230,19 +13799,19 @@ msgstr "Could not acquire image" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Connecting" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Connected" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Not connected" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Connection Failed" @@ -13281,32 +13850,32 @@ msgstr "LiveGPS layer" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Capture GPS Track" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "Connect to gpsd server and show current position in LiveGPS layer." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Centre Once" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Centre the LiveGPS layer to current position." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Auto-Centre" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Continuously centre the LiveGPS layer to current position." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13357,9 +13926,9 @@ msgstr "Can not draw outside of the world." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "measurement mode" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Measurements" @@ -13397,5 +13966,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13406,13 +13975,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13564,5 +14133,5 @@ msgstr "Firefox executable" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13657,5 +14226,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13731,41 +14300,41 @@ msgstr "Enter weight values" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Load Tile" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Load All Tiles" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Increase zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Decrease zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "Flush Tile Cache" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "image " @@ -13935,4 +14504,43 @@ msgstr "You have to specify tagging preset sources in the preferences first." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Even" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Lowest number" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Highest number" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Streets" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Highest number" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13951,42 +14559,20 @@ msgstr "Reverse Terrace" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Terrace a building" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Creates individual buildings from a long building." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Select a single, closed way of at least four nodes." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Terrace" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Highest number" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Lowest number" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolation" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Street name" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Optional" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14001,5 +14587,5 @@ msgstr "No validation errors" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Grid" @@ -14658,38 +15244,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "building" @@ -14703,5 +15259,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "area" @@ -14818,10 +15374,10 @@ msgstr "Could not read information from walking-papers.org the id \"{0}\"" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Walking Papers: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15568,6 +16124,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Reference" @@ -16013,5 +16569,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Width (metres)" @@ -16129,5 +16685,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -16139,5 +16695,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "wood" @@ -16395,4 +16951,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16424,8 +16983,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "yes" @@ -16573,9 +17134,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "no" @@ -16820,5 +17382,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "residential" @@ -16853,5 +17415,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "service" @@ -16885,6 +17447,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "construction" @@ -16934,5 +17496,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "roundabout" @@ -17120,6 +17682,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Hiking" @@ -17240,5 +17802,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17264,4 +17825,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17271,15 +17833,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operator" @@ -17491,7 +18053,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Elevation" @@ -17910,5 +18472,5 @@ msgstr "bog" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17918,5 +18480,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "marsh" @@ -18442,32 +19004,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Opening Hours" @@ -18526,91 +19088,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18625,5 +19187,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18642,7 +19204,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Reference number" @@ -18658,5 +19220,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "underground" @@ -18669,6 +19231,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Fee" @@ -18707,22 +19269,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Shop" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Edit Car Shop" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Repair" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Edit Car Repair" @@ -18730,5 +19280,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Rental" @@ -18737,10 +19287,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Edit Car Rental" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Sharing" @@ -18748,5 +19298,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Edit Car Sharing" @@ -18754,10 +19304,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Edit Bicycle Parking" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Capacity" @@ -18766,22 +19316,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Edit Bicycle Rental" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Edit Bicycle Shop" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Public Transport" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18791,5 +19334,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18797,5 +19340,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Reference" @@ -18803,5 +19346,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Railway Halt" @@ -18809,5 +19352,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Edit Halt" @@ -18815,5 +19358,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Tram Stop" @@ -18822,5 +19365,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Edit Tram Stop" @@ -18828,5 +19371,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Railway Platform" @@ -18835,5 +19378,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Edit Railway Platform" @@ -18845,5 +19388,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Reference (track number)" @@ -18851,10 +19394,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Area" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Subway Entrance" @@ -18863,10 +19406,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Edit Subway Entrance" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Wheelchair" @@ -18875,5 +19418,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Bus Station" @@ -18882,5 +19425,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Edit Bus Station" @@ -18888,5 +19431,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Bus Stop" @@ -18896,5 +19439,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Edit Bus Stop" @@ -18903,17 +19446,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Shelter" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Bench" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Bus Platform" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Edit Bus Platform" @@ -18921,5 +19472,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -18927,5 +19478,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Edit Taxi station" @@ -18933,5 +19484,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Airport" @@ -18939,15 +19490,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Edit Airport" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18955,10 +19506,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Accomodation" @@ -18970,5 +19521,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -18977,15 +19528,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Edit Hotel" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Stars" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motel" @@ -18993,20 +19544,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Edit Motel" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Guest House" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Edit Guest House" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Chalet" @@ -19014,10 +19565,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Edit Chalet" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Hostel" @@ -19025,30 +19576,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Edit Hostel" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Alpine Hut" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Edit Alpine Hut" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Caravan Site" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Edit Caravan Site" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Camp Site" @@ -19056,10 +19607,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Edit Camp Site" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Food+Drinks" @@ -19070,5 +19621,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -19076,5 +19627,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Edit Restaurant" @@ -19082,5 +19633,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Cuisine" @@ -19088,61 +19639,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italian" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "chinese" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "burger" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "greek" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "german" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indian" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "regional" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turkish" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asian" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thai" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexican" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japanese" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Fast Food" @@ -19150,9 +19701,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Edit Fast Food Restaurant" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Cafe" @@ -19160,9 +19711,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Edit Cafe" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pub" @@ -19170,18 +19721,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Edit Pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Edit Biergarten" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Bar" @@ -19189,9 +19740,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Edit Bar" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Nightclub" @@ -19199,24 +19750,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Edit Nightclub" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Tourism" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Attraction" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Edit Attraction" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museum" @@ -19224,9 +19775,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Edit Museum" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -19235,9 +19786,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Edit Zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Viewpoint" @@ -19245,24 +19796,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Edit Viewpoint" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Look-Out Tower" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Theme Park" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Edit Theme Park" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Artwork" @@ -19270,5 +19821,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Edit Artwork" @@ -19276,19 +19827,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Information Office" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Map" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -19326,5 +19877,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19332,28 +19883,28 @@ msgstr "street" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Closer Description" @@ -19363,5 +19914,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -19369,6 +19920,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Cycling" @@ -19376,5 +19927,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19382,6 +19933,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Skiing" @@ -19389,5 +19940,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19395,46 +19946,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Information Board" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "history" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "nature" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "wildlife" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19442,29 +19993,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. -#: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 msgid "Phone number" msgstr "" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Other Information Points" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Edit Shelter" @@ -19472,25 +20023,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Fireplace" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Picnic Site" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Edit Picnic Site" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Historic Places" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Castle" @@ -19499,19 +20050,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Edit Castle" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruins" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Edit Ruins" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Archaeological Site" @@ -19520,9 +20071,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Edit Archaeological Site" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Battlefield" @@ -19530,10 +20081,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Edit Battlefield" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19541,5 +20092,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19547,15 +20098,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monument" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Edit Monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Memorial" @@ -19563,55 +20114,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Edit Memorial" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Wayside Cross" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Edit Wayside Cross" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Wayside Shrine" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Edit Wayside Shrine" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Leisure" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Water Park" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Edit Water Park" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Playground" @@ -19619,35 +20170,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Edit Playground" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Fishing" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Edit Fishing" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Sports" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Sport Facilities" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadium" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Edit Stadium" @@ -19661,6 +20212,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "select sport:" @@ -20052,30 +20603,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "sport" @@ -20085,225 +20636,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "multi" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "archery" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "athletics" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "australian_football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basketball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "boules" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "lawn bowls" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "canoeing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "climbing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "cricket nets" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "croquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "cycling" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "dog racing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "equestrian" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gymnastics" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hockey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "horse_racing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "motor" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "racquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "shooting" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "skating" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "skiing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "soccer" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "swimming" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "table_tennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Sports Centre" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Edit Sports Centre" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Pitch" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Edit Pitch" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Racetrack" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Edit Racetrack" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golf Course" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Edit Golf Course" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Miniature Golf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Edit Miniature Golf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Multi" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Edit Multi" @@ -20342,21 +20893,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "type" @@ -20395,203 +20946,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "pitch" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "sports_centre" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadium" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "10pin" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Edit 10pin" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Athletics" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Edit Athletics" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Archery" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Edit Archery" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Climbing" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Edit Climbing" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Canoeing" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Edit Canoeing" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Edit Cycling" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Dog Racing" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Edit Dog Racing" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Equestrian" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Edit Equestrian" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Horse Racing" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Edit Horse Racing" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gymnastics" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Edit Gymnastics" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Motor Sports" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Edit Motor Sports" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Skating" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Edit Skating" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Edit Skateboard" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Swimming" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Edit Swimming" @@ -20599,56 +21150,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Edit Skiing" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Piste type" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "downhill" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "nordic" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "snow_park" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Difficulty" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "novice" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "easy" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "intermediate" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "advanced" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "expert" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "freeride" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Shooting" @@ -20656,182 +21207,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Edit Shooting" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Sport (Ball)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Football" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Edit Football" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "American Football" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Edit American Football" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Australian Football" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Edit Australian Football" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Edit Baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Edit Basketball" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Edit Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golf_course" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Edit Boule" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Bowls" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Edit Bowls" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Edit Cricket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Cricket Nets" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Edit Cricket Nets" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Edit Croquet" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Edit Hockey" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Edit Pelota" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Racquet" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Edit Racquet" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Edit Rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Table Tennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Edit Table Tennis" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Edit Tennis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Buildings" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Building" @@ -20839,5 +21390,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Public Building" @@ -20845,10 +21396,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Edit Public Building" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Town hall" @@ -20856,10 +21407,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Edit Town hall" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Embassy" @@ -20867,10 +21418,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Edit Embassy" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Courthouse" @@ -20879,10 +21430,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Edit Courthouse" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Prison" @@ -20891,10 +21442,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Edit Prison" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Police" @@ -20904,10 +21455,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Edit Police" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Fire Station" @@ -20916,10 +21467,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Edit Fire Station" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Post Office" @@ -20927,5 +21478,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Edit Post Office" @@ -20933,15 +21484,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Preschool" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Edit Preschool" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "School" @@ -20949,10 +21500,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Edit School" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "University" @@ -20960,10 +21511,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Edit University" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "College" @@ -20971,5 +21522,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Edit College" @@ -20977,5 +21528,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Cinema" @@ -20984,10 +21535,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Edit Cinema" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Library" @@ -20996,9 +21547,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Edit Library" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Arts Centre" @@ -21006,10 +21557,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Edit Arts Centre" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Theatre" @@ -21018,10 +21569,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Edit Theatre" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Place of Worship" @@ -21031,5 +21582,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Edit Place of Worship" @@ -21038,6 +21589,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religion" @@ -21046,66 +21597,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "christian" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "jewish" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "unitarian" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrian" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Denomination" @@ -21114,81 +21665,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglican" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "catholic" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangelical" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "jehovahs_witness" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "lutheran" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "methodist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormon" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbyterian" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Addresses" @@ -21197,5 +21748,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Edit Address Information" @@ -21203,5 +21754,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "House number" @@ -21209,20 +21760,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "House name" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Street name" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "City name" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Post code" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Country code" @@ -21231,5 +21787,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Edit Address Interpolation" @@ -21237,61 +21793,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Numbering scheme" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "odd" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "even" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "alphabetic" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Man Made" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Works" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Edit Works" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Tower" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Edit Tower" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -21299,25 +21855,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Water Tower" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Edit Water Tower" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gasometer" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Edit Gasometer" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Lighthouse" @@ -21325,10 +21881,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Edit Lighthouse" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Windmill" @@ -21336,10 +21892,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Edit Windmill" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Pipeline" @@ -21348,37 +21904,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Edit Pipeline" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Sewerage Plant" @@ -21388,10 +21944,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Edit Sewerage Plant" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Crane" @@ -21399,10 +21955,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Edit Crane" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Beacon" @@ -21410,10 +21966,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Edit Beacon" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Survey Point" @@ -21421,10 +21977,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Edit Survey Point" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Surveillance" @@ -21432,5 +21988,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Edit Surveillance Camera" @@ -21438,5 +21994,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Power Generator" @@ -21446,35 +22002,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Edit Power Generator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "hydro" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "coal" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "photovoltaic" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Power Station" @@ -21483,10 +22039,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Edit Power Station" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Power Sub Station" @@ -21495,5 +22051,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Edit Power Sub Station" @@ -21501,10 +22057,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Line reference" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Power Tower" @@ -21515,23 +22071,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Edit Power Tower" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Power Line" @@ -21540,75 +22096,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Edit Power Line" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Voltage" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Amenities" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Toilets" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Post Box" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telephone" @@ -21617,5 +22173,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Edit Telephone" @@ -21623,5 +22179,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Coins" @@ -21629,5 +22185,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Notes" @@ -21635,5 +22191,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Electronic purses and Charge cards" @@ -21641,5 +22197,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Debit cards" @@ -21647,15 +22203,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Credit cards" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telephone cards" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Recycling" @@ -21664,5 +22220,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Edit Recycling station" @@ -21670,68 +22226,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Cans" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Clothes" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Glass" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Paper" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Scrap Metal" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Bench" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21802,39 +22353,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "green" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Hunting Stand" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Edit Hunting Stand" @@ -21843,30 +22394,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Height" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "low" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "half" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "full" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Hide" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Lock" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fountain" @@ -21875,10 +22426,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Edit Fountain" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Drinking Water" @@ -21887,10 +22438,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Edit Drinking Water" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Baby Hatch" @@ -21898,33 +22449,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Edit Baby Hatch" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Shops" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Edit Car Shop" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Edit Bicycle Shop" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Edit Supermarket" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Convenience Store" @@ -21932,9 +22507,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Edit Convenience Store" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosk" @@ -21942,27 +22517,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Edit Kiosk" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Vending machine" @@ -21970,5 +22545,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Edit Vending machine" @@ -21976,88 +22551,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Vending products" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "food" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "sweets" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "toys" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Account or loyalty cards" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Butcher" @@ -22065,9 +22640,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Edit Butcher" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Baker" @@ -22075,9 +22650,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Edit Baker" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Florist" @@ -22085,18 +22660,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Edit Florist" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Organic" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Edit Organic Shop" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Alcohol" @@ -22104,54 +22679,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Edit Alcohol Shop" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Beverages" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Edit Beverages Shop" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Edit Computer Shop" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Electronics" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Edit Electronics Shop" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Edit Hifi Shop" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Furniture" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Edit Furniture Shop" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Garden Centre" @@ -22159,9 +22734,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Edit Garden Centre" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Hardware" @@ -22169,9 +22744,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Edit Hardware Store" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Do-it-yourself-store" @@ -22179,54 +22754,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Edit Do-it-yourself-store" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Stationery" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Edit Stationery Shop" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Hairdresser" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Edit Hairdresser" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Shoes" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Edit Shoe Shop" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Toys" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Edit Toy Shop" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Edit Video Shop" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Dry Cleaning" @@ -22234,9 +22809,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Edit Dry Cleaning" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Laundry" @@ -22244,9 +22819,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Edit Laundry" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Outdoor" @@ -22254,28 +22829,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Edit Outdoor Shop" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Edit Sports Shop" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Optician" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Edit Optician" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Cash" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Bank" @@ -22283,14 +22858,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Edit Bank" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Automated Teller Machine" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Money Exchange" @@ -22298,5 +22873,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Edit Money Exchange" @@ -22304,15 +22879,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Edit Automated Teller Machine" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Health" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Doctors" @@ -22320,18 +22895,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Edit Doctors" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Dentist" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Edit Dentist" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Pharmacy" @@ -22339,5 +22914,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Edit Pharmacy" @@ -22345,9 +22920,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Dispensing" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Hospital" @@ -22355,10 +22930,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Edit Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Emergency Access Point" @@ -22367,5 +22942,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Edit Emergency Access Point" @@ -22374,20 +22949,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Point Number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Point Name" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Phone Number" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Use international code, like +12-345-67890)" @@ -22395,5 +22970,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Veterinary" @@ -22402,64 +22977,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Edit Veterinary" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Places" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Continent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Edit Continent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Country" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Edit Country" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "State" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Edit State" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Edit Region" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "County" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Edit County" @@ -22467,15 +23042,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "City" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Edit City" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Town" @@ -22483,10 +23058,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Edit Town" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Suburb" @@ -22494,25 +23069,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Edit Suburb" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Village" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Edit Village" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Hamlet" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Edit Hamlet" @@ -22520,5 +23095,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Locality" @@ -22526,10 +23101,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Edit Locality" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Island" @@ -22537,10 +23112,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Edit Island" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22548,5 +23123,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22554,5 +23129,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Cave Entrance" @@ -22560,10 +23135,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Edit Cave Entrance" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Peak" @@ -22571,10 +23146,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Edit Peak" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Glacier" @@ -22582,10 +23157,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Edit Glacier" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Volcano" @@ -22593,70 +23168,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Edit Volcano" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Boundaries" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "National" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Edit National Boundary" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administrative" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Edit Administrative Boundary" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Civil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Edit Civil Boundary" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Political" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Edit Political Boundary" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "National park" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Edit National Park Boundary" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Land use" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Tree" @@ -22665,15 +23240,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Edit Tree" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botanical Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Wood" @@ -22682,5 +23257,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Edit Wood" @@ -22688,17 +23263,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "coniferous" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Forest" @@ -22707,14 +23282,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Edit Forest Landuse" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Nature Reserve" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Edit Nature Reserve" @@ -22722,25 +23297,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Scree" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Edit Scree" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Scrub" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Edit Scrub" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Fell" @@ -22748,10 +23323,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Edit Fell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Heath" @@ -22759,5 +23334,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Edit Heath" @@ -22765,5 +23340,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Farmyard" @@ -22772,45 +23347,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Edit Farmyard Landuse" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Farmland" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Edit Farmland Landuse" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Meadow" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Edit Meadow Landuse" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vineyard" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Edit Vineyard Landuse" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Allotments" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Edit Allotments Landuse" @@ -22818,25 +23393,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Garden" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Edit Garden" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Grass" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Edit Grass Landuse" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Village Green" @@ -22844,10 +23419,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Edit Village Green Landuse" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Common" @@ -22855,20 +23430,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Edit Common" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Edit Park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Recreation Ground" @@ -22876,5 +23451,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Edit Recreation Ground Landuse" @@ -22882,15 +23457,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Residential area" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Edit Residential Landuse" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Graveyard" @@ -22898,9 +23473,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Edit Graveyard" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Cemetery" @@ -22908,39 +23483,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Edit Cemetery Landuse" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Retail" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Edit Retail Landuse" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Commercial" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Edit Commercial Landuse" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Industrial" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Edit Industrial Landuse" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Railway land" @@ -22948,15 +23523,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Edit Railway Landuse" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Military" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Edit Military Landuse" @@ -22964,55 +23539,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Construction area" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Edit Construction Landuse" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Brownfield" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Edit Brownfield Landuse" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Greenfield" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Edit Greenfield Landuse" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Landfill" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Edit Landfill Landuse" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Quarry" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Edit Quarry Landuse" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multipolygon" @@ -23022,5 +23597,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Edit Multipolygon" @@ -23029,10 +23604,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "outer segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "inner segment" @@ -23040,5 +23615,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Turn restriction" @@ -23047,5 +23622,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Edit Turn Restriction" @@ -23053,34 +23628,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "no left turn" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "no right turn" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "no straight on" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "no U turn" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "only turn right" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "only turn left" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "only straight on" @@ -23089,15 +23664,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "from way" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "via node or way" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "to way" @@ -23105,5 +23680,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Route" @@ -23112,5 +23687,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Edit Route" @@ -23118,5 +23693,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Route type" @@ -23188,24 +23763,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "bicycle" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "road" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "ski" @@ -23258,5 +23833,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23265,13 +23840,13 @@ msgstr "foot" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "hiking" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "detour" @@ -23285,10 +23860,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "subway" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Symbol description" @@ -23296,31 +23871,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Network" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "proposed" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "alternate" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "temporary" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "connection" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Colour (hex)" @@ -23329,30 +23904,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "route segment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "forward segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "backward segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "halt point" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "forward halt point" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "backward halt point" @@ -23563,130 +24138,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23703,98 +24152,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "deprecated" @@ -24171,7 +24529,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "highway_track" @@ -24235,13 +24593,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "rail" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24257,5 +24694,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "services" @@ -24269,5 +24706,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "ford" @@ -24288,5 +24725,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "turningcircle" @@ -24301,5 +24738,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "emergency_access_point" @@ -24314,5 +24751,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "riverbank" @@ -24326,5 +24763,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "stream" @@ -24338,5 +24775,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "dock" @@ -24358,16 +24795,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "aqueduct" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24464,4 +24889,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24530,13 +24962,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "manmade" @@ -24582,6 +25014,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24598,7 +25030,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "railwaypoint" @@ -24621,10 +25053,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "otherrail" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "railover" @@ -24660,11 +25092,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "oldrail" #. color rail +#. #. 1 #. 50000 @@ -24705,6 +25138,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "aeroway" @@ -24718,5 +25151,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -24738,5 +25171,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "aeroway_dark" @@ -24750,5 +25183,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "aeroway_light" @@ -24756,4 +25189,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24803,7 +25243,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "aerialway" @@ -24820,5 +25260,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "piste_easy" @@ -24833,5 +25273,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "piste_intermediate" @@ -24846,5 +25286,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "piste_advanced" @@ -24859,5 +25299,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "piste_expert" @@ -24872,5 +25312,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "piste_freeride" @@ -24885,5 +25325,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "piste_novice" @@ -25003,11 +25443,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "power" @@ -25021,5 +25461,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "pier" @@ -25033,5 +25473,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "pipeline" @@ -25159,12 +25599,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "leisure" @@ -25178,5 +25635,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "marina" @@ -25214,4 +25671,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25230,4 +25703,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25248,8 +25729,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "amenity" @@ -25351,10 +25834,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "amenity_traffic" @@ -25608,5 +26091,5 @@ #. #. -#. +#. #. color health #. @@ -25752,4 +26235,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25769,23 +26260,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "amenity_light" @@ -25817,6 +26308,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "light_water" @@ -25877,14 +26368,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "health" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26231,5 +26722,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26252,5 +26742,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "shop" @@ -26322,8 +26813,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotel" @@ -26424,9 +26915,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "tourism" @@ -26514,9 +27005,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "historic" @@ -26530,5 +27021,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "quarry" @@ -26542,5 +27033,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "landfill" @@ -26562,5 +27053,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "basin" @@ -26574,5 +27065,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "forest" @@ -26586,5 +27077,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "farmyard" @@ -26607,5 +27098,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "retail" @@ -26619,5 +27110,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "industrial" @@ -26631,5 +27122,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "brownfield" @@ -26643,5 +27134,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "greenfield" @@ -26655,5 +27146,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "railland" @@ -26710,7 +27201,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "military" @@ -26724,5 +27215,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "cemetery" @@ -26735,5 +27226,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "peak" @@ -26748,5 +27239,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "glacier" @@ -26760,5 +27251,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "volcano" @@ -26813,8 +27304,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "natural" @@ -26828,5 +27319,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "scrub" @@ -26840,5 +27331,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "heath" @@ -26852,5 +27343,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26864,5 +27355,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "mud" @@ -26876,5 +27367,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "beach" @@ -26952,8 +27443,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "route" @@ -27001,7 +27492,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "boundary" @@ -27151,11 +27642,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "place" @@ -27203,6 +27694,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "address" @@ -27558,21 +28049,129 @@ msgstr "" +#~ msgid "Updating primitive" +#~ msgstr "Updating primitive" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Expected closing bracket." + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" + +#~ msgid "Use an open changeset" +#~ msgstr "Use an open changeset" #~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" - -#~ msgid "Images for {0}" -#~ msgstr "Images for {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Read GPX..." +#~ "I can take a picture of my GPS receiver.
Can this help?" + +#~ msgid "All images" +#~ msgstr "All images" + +#~ msgid "Images with no exif position" +#~ msgstr "Images with no exif position" + +#~ msgid "Not yet tagged images" +#~ msgstr "Not yet tagged images" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Found {0} matches of {1} in GPX track {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPX Track loaded" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Offset between track and photos: {0}m {1}s" + +#~ msgid "Default Values" +#~ msgstr "Default Values" + +#~ msgid "Enable proxy server" +#~ msgstr "Enable proxy server" + +#~ msgid "Anonymous" +#~ msgstr "Anonymous" + +#~ msgid "Proxy server host" +#~ msgstr "Proxy server host" + +#~ msgid "Proxy server port" +#~ msgstr "Proxy server port" + +#~ msgid "Proxy server username" +#~ msgstr "Proxy server username" + +#~ msgid "Proxy server password" +#~ msgstr "Proxy server password" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, possibly some missing tags." + +#~ msgid "Preparing..." +#~ msgstr "Preparing..." + +#~ msgid "Uploading..." +#~ msgstr "Uploading..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Incorrect password or username." + +#~ msgid "Enter Password" +#~ msgstr "Enter Password" + +#~ msgid "Login" +#~ msgstr "Login" + +#~ msgid "Auto-tag source added:" +#~ msgstr "Auto-tag source added:" + +#~ msgid "Interpolation" +#~ msgstr "Interpolation" + +#~ msgid "Optional" +#~ msgstr "Optional" + +#~ msgid "Shop" +#~ msgstr "Shop" + +#~ msgid "aqueduct" +#~ msgstr "aqueduct" + +#~ msgid "Move" +#~ msgstr "Move" + +#~ msgid "Data Layer" +#~ msgstr "Data Layer" + +#~ msgid "No data imported." +#~ msgstr "No data imported." + +#~ msgid "Select a bookmark first." +#~ msgstr "Select a bookmark first." + +#~ msgid "No document open so nothing to save." +#~ msgstr "No document open so nothing to save." + +#~ msgid "Unknown file extension." +#~ msgstr "Unknown file extension." + +#~ msgid "Refresh the selection list." +#~ msgstr "Refresh the selection list." + +#~ msgid "Merging conflicts." +#~ msgstr "Merging conflicts." + +#~ msgid "Resolve Conflicts" +#~ msgstr "Resolve Conflicts" + +#~ msgid "Object" +#~ msgstr "Object" + +#~ msgid "There were conflicts during import." +#~ msgstr "There were conflicts during import." #~ msgid "No time for point {0} x {1}" @@ -27615,76 +28214,6 @@ #~ msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "GPS unit timezone (difference to photo)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Synchronise Time with GPS Unit" - #~ msgid "Time entered could not be parsed." #~ msgstr "Time entered could not be parsed." - -#~ msgid "" -#~ "Loading of {0} plugin was requested. This plugin is no longer required." -#~ msgstr "" -#~ "Loading of {0} plugin was requested. This plugin is no longer required." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Geotagged pictures" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Open images with AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "osmarender options" - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." - -#~ msgid "Move" -#~ msgstr "Move" - -#~ msgid "Data Layer" -#~ msgstr "Data Layer" - -#~ msgid "No data imported." -#~ msgstr "No data imported." - -#~ msgid "Select a bookmark first." -#~ msgstr "Select a bookmark first." - -#~ msgid "File could not be found." -#~ msgstr "File could not be found." - -#~ msgid "No document open so nothing to save." -#~ msgstr "No document open so nothing to save." - -#~ msgid "Unknown file extension." -#~ msgstr "Unknown file extension." - -#~ msgid "Refresh the selection list." -#~ msgstr "Refresh the selection list." - -#~ msgid "Merging conflicts." -#~ msgstr "Merging conflicts." - -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolve Conflicts" - -#~ msgid "Object" -#~ msgstr "Object" - -#~ msgid "There were conflicts during import." -#~ msgstr "There were conflicts during import." #~ msgid "Hint: Some changes came from uploading new data to the server." @@ -27760,4 +28289,7 @@ #~ "selected in the history list." +#~ msgid "Images for {0}" +#~ msgstr "Images for {0}" + #~ msgid "Email" #~ msgstr "E-Mail" @@ -27844,6 +28376,12 @@ #~ msgstr "name" +#~ msgid "Read GPX..." +#~ msgstr "Read GPX..." + #~ msgid "Please report a ticket at {0}" #~ msgstr "Please report a ticket at {0}" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS unit timezone (difference to photo)" #~ msgid "Be sure to include the following information:" @@ -27990,4 +28528,13 @@ #~ msgid "error requesting update" #~ msgstr "error requesting update" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotagged pictures" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Open images with AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "osmarender options" #~ msgid "Metacarta Map Rectifier image id" @@ -28211,4 +28758,7 @@ #~ "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchronise Time with GPS Unit" + #~ msgid "sports" #~ msgstr "sports" @@ -28326,4 +28876,11 @@ #~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." + +#~ msgid "" #~ "Tools to work with authors/users. Selects map data that belongs to " #~ "selected user, opens browser showing selected author profile page." @@ -28331,4 +28888,11 @@ #~ "Tools to work with authors/users. Selects map data that belongs to " #~ "selected user, opens browser showing selected author profile page." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." #~ msgid "Directly load TCX files from JOSM." @@ -28429,7 +28993,4 @@ #~ msgid "Select a starting node on the end of a way" #~ msgstr "Select a starting node on the end of a way" - -#~ msgid "Reached a junction" -#~ msgstr "Reached a junction" #~ msgid "" @@ -28630,6 +29191,10 @@ #~ msgstr "Download referrers..." -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" -#~ msgstr "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" #~ msgid "Can't search because there is no loaded data." @@ -28700,4 +29265,9 @@ #~ "Failed to close changeset {0}, will be closed by server after timeout. " #~ "Exception was: {1}" + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." #~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds" @@ -28749,4 +29319,9 @@ #~ "\"{1}\">your language." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" + #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "Didn't find an primitive with id {0} in this dataset" @@ -28784,9 +29359,4 @@ #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." -#~ msgstr "" -#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" - -#~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " #~ "''{1}''." Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 19198) +++ /applications/editors/josm/i18n/po/es.po (revision 19199) @@ -4,11 +4,12 @@ # FIRST AUTHOR , 2006. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-12-06 10:44+0000\n" -"Last-Translator: Emilio Gomez Fernandez \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-22 10:32+0000\n" +"Last-Translator: Jesús Gómez Fernández \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:30+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Creando la interfaz principal de usuario" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Ayuda" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formado: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,18 +95,8 @@ msgstr "Aviso" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de archivo malformado: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"No se puede leer el archivo ''{0}''.
El error es:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -113,8 +104,18 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"No se puede leer el archivo ''{0}''.
El error es:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -122,10 +123,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -137,9 +138,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -148,6 +150,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -202,8 +204,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -271,5 +273,5 @@ msgstr "Acerca de JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -281,5 +283,5 @@ "base de la API es: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -291,5 +293,5 @@ "API es: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -300,15 +302,20 @@ "la pantalla con ventanas y llevar bastante tiempo en terminar." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Continuar" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -317,29 +324,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -356,5 +364,10 @@ msgstr "Cancelar" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Clic para anular la fusión de nodos" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Por favor, seleccione al menos un nodo, vía o relación ya subida." @@ -370,5 +383,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Unir" @@ -387,15 +400,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Añadir nodo..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Añadir nodo entrando latitud y longitud." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -411,22 +424,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Editar: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Introduzca las coordenadas para el nuevo nodo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Usar grados decimales." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valores negativos denotan hemisferio Oeste/Sur" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -435,5 +448,5 @@ msgstr "Latitud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -442,28 +455,29 @@ msgstr "Longitud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "Por favor, introduce una latitud válida en el rango -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "Por favor, una latitud válida en el rango -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "Por favor, introduce una latitud válida en el rango-180..180" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "Introduzca una longitud en el rango -180..180" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -475,9 +489,9 @@ msgstr "Aceptar" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "Cerrar el diálogo y crear un nuevo nodo" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "Cerrar el diálogo, no crear un nuevo nodo" @@ -498,18 +512,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -521,5 +535,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -541,6 +555,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -587,5 +601,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflicto" @@ -622,14 +636,15 @@ msgstr "No existen conflictos a los que hacer zoom" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Cerrar conjuto de cambios abiertos" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Cierre de los conjuntos de cambios abiertos" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -639,21 +654,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Archivo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "No hay conjuntos de cambios abiertos" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Ningún conjunto de cambios abiertos" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Descargando conjunto de cambios abiertos..." @@ -740,11 +755,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -825,16 +841,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -870,5 +891,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplicar" @@ -911,10 +932,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Exportar a GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Exportar los datos a archivo GPX" @@ -929,12 +950,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -959,8 +980,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -971,10 +992,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -987,17 +1008,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1036,22 +1057,27 @@ "Mostrar información sobre los objetos nodos, formas o relaciones de OSM." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Unir áreas superpuestas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Unir áreas que se superponen con otras" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Por favor, seleccione al menos un vial cerrado para ser unido." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Sólo un máximo de dos áreas pueden unirse por el momento." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" no está cerrado y, por tanto, no se puede unir." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1064,38 +1090,34 @@ "¿Está seguro de continuar?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Por favor, abortar si usted no está seguro" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Por favor, seleccione al menos un vial cerrado para ser unido." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "No se encontró ninguna intersección. Nada ha cambiado." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Nodo añadido en todas las intersecciones" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Eliminar vías que no formen parte de un multipolígono interior" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Arreglar relaciones" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Fusionar área superpuesta consigo misma" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Fusionar áreas superpuestas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1105,33 +1127,33 @@ "favor, compruebe los errores no se han introducido." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Introduzca valores para todos los conflictos." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Resolver conflictos" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Arreglar conflictos de etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Eliminar elementos de las relaciones" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Fusionar áreas: eliminar las vías cortas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Vía cerrada" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Eliminar etiquetas de vías internas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Función para la fusión de áreas" @@ -1297,5 +1319,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Imposible mover objetos fuera del mundo." @@ -1375,28 +1397,28 @@ msgstr "Descargar datos" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Ortogonalizar forma" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Mover nodos de forma que todos los águlos tengan 90 o 270 grados." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 msgid "Orthogonalize Shape / Undo" msgstr "Ortogonalizar forma / Deshacer" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 msgid "Undo orthogonalization for certain nodes" msgstr "Deshacer ortogonalización para determinados nodos" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "Ortogonalizar / Deshacer" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1408,9 +1430,9 @@ "de Ortogonalizar forma!" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "Dehacer ortogonalizar forma" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1423,16 +1445,16 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Ortogonalizar" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Uso" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "Los elementos seleccionados no pueden ser ortogonalizados" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Ortogonalizar" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1507,18 +1529,18 @@ msgstr "No se puede reombrar el archivo ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Cambiar el sentido de las vías" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Invertir el sentido de todas las vías seleccionadas." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Por favor seleccione por lo menos una vía." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Cambiar el sentido de las vías" @@ -1527,10 +1549,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Guardar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Guardar los datos actuales." @@ -1587,10 +1609,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Guardar como..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Guardar los datos actuales en un nuevo archivo." @@ -1635,6 +1657,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1668,5 +1689,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1731,5 +1752,5 @@ "nodos de la mitad de la vía)." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1739,5 +1760,5 @@ "rutas.
Debería verificar esto y corregirlo cuando sea necesario." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1747,5 +1768,5 @@ "verificar y corregirlo cuando sea necesareo." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1779,43 +1800,43 @@ msgstr "Este nodo no está pegado a ninguna otra cosa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Ninguno de éstos nodos está pegado a ninguna otra cosa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Ninguno de los nodos de esta vía está pegado a ninguna otra cosa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "La selección actual no se puede usar para despegar." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Selecione alguno:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Un nodo etiquetado, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Un nodo que sea usado por más de una vía, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* Un nodo usado por más de una vía y una de esas vías, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* Una vía que tenga un nodo o más usado por más de una vía, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "*Una vía y un nodo o más de sus nodos usados por más de una vía." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1829,9 +1850,9 @@ "seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Nodo despegado" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1839,5 +1860,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1872,10 +1893,10 @@ msgstr "Deseleccionar todos (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Actualizar datos" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "Actualizar desde el servidor los objetos en la capa de datos activa." @@ -1883,14 +1904,14 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "Descargar datos" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Actualización de datos no encontrada" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" @@ -1898,9 +1919,9 @@ "No se ha encontrado ningún objeto con ID {0} en el conjunto de datos actual" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "Actualizar selección" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1909,31 +1930,27 @@ "descarga de datos)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Actualización de selección" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "No hay objetos seleccionados que actualizar." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selección vacía" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "Cargando objetos" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Subir datos" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" "Actualizar en el servidor todos los objetos en la capa de datos activa." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1944,5 +1961,5 @@ "corregirlos primero." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1950,148 +1967,7 @@ msgstr "Ningún cambio que subir" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algunos datos primero." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "Sincronizar únicamente el nodo {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "Sincronizar únicamente la vía {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Sincronizar únicamente la relación {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Sincronizar el conjunto de datos completo" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"La subida falló debido a que el servidor tiene una " -"versión más reciente de uno
de sus nodos, vías o relaciones.
El " -"conflicto es causado por el {0} con ID {1}," -"
el servidor tiene la versión {2}, su versión es {3}.

Pulse " -"{4} para sincronizar los primitivos en conflicto únicamente." -"
Pulse {5} para sincronizar el conjunto de datos local " -"completo con el servidor.
Pulse {6} para abortar y " -"continuar editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Se han detectado conflictos" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"La subida falló porque el servidor tiene una versión " -"más reciente de uno
de sus nodos, vías o relaciones.

Pulse " -"{0} para sincronizar el conjunto de datos local completo con el " -"servidor.
Pulse {1} para abortar y continuar editando." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"El envío de datos falló debido a que se ha " -"empleado
un conjunto de cambios {0} que se cerró previamente ({1})." -"
Vuelva a enviar los datos de nuevo con un conjunto de cambios nuevo o " -"uno existente y abierto." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Conjunto de cambios cerrados" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "Preparar la resolución de conflictos" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "Haz click para cancelar y continuar editando el mapa" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "Nodo todavía en uso" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Oinarrizkoa eguneratzen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Subiendo datos de la capa \"{0}\"" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "Subiendo {0} objetos..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2226,9 +2102,9 @@ msgstr "Datos GPX descargados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Descargando datos" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2237,5 +2113,5 @@ "Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "No se han encontrado datos para este area." @@ -2314,7 +2190,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2331,58 +2207,52 @@ "los nodos sin usar al borrar una vía. Con Ctrl: borrar los objetos referidos." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Dibujar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Dibujar nodos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Modo: Dibujar foco" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "seleccionado" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "No se puede añadir un nodo fuera del mundo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Añadir nodo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Añadir nodo a la vía" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Conectar la vía existente al nodo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Añadir un nodo nuevo a una vía existente" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Añadir un nodo a la vía y conectar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Crear un nodo nuevo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Seleccionar el nodo bajo el cursor." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2391,14 +2261,14 @@ msgstr[1] "Insertar un nuevo nodo en {0} vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Comenzar una nueva vía desde el último nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Continuar la vía desde el último nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Finalizar dibujo." @@ -2441,18 +2311,19 @@ "en ese punto." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Seleccionar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Seleccionar, mover y rotar objetos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2461,17 +2332,17 @@ msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Mover elementos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Moverlos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Deshacer mover" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2484,14 +2355,14 @@ "¿Desea desplazarlos realmente?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Siempre mover y no mostrar la ventana de diálogo de nuevo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" "Soltar el botón del ratón para seleccionar los objetos en el rectángulo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2500,9 +2371,9 @@ "más cercano." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Soltar el botón del ratón para parar de rotar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2514,5 +2385,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zoom" @@ -2536,5 +2407,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Búsqueda de objetos." @@ -2627,8 +2498,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -"user:... - todos los objetos modificados por un determinado usuario" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2637,8 +2506,20 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - objetos con un determinado número de nodos" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" +"tags:... - objeto con un número dado de etiquetas (tags:total o tags:" +"min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2648,21 +2529,27 @@ "min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - todos los objetos modificados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - todos los objetos seleccionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - todos los objetos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - todos los objetos sin etiquetar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2671,5 +2558,5 @@ "la expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2678,5 +2565,5 @@ "cumplan la expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2684,16 +2571,16 @@ "lógico O (disyunción)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Usar \" para delimitar operadores (por ejemplo si la clave contiene :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Usar ( y ) para agrupar expresiones" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2701,55 +2588,55 @@ msgstr "Filtrar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "Enviar filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Iniciar búsqueda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "No se encontraron coincidencias para \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "No se ha añadido nada a la selección al buscar \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "No se ha quitado nada de la selección al buscar \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "No se ha encontrado nada en la selección buscando por ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Se han encontrado {0} coincidencias" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2763,5 +2650,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2769,10 +2656,10 @@ "de uso: clave=valor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Error en la sintáxis del patrón: ¡el patrón {0} de {1} no es válido!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2781,26 +2668,29 @@ "relación" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Credencial de autentificación inexperada: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "No se encuentran los argumentos de or" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "No se encuentran los argumentos de not" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Se esperaba un cierre de paréntesis." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "No se encuentran los argumentos de or" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "Número de parámetros erróneos para las etiquetas de operador" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2811,9 +2701,9 @@ "rango de etiquetas, por ejemplo tags:1 o tags:2-5" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Número de parámetros incorrecto para el operador de nodos." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2824,7 +2714,12 @@ "número de nodos o un intervalo, por ejemplo nodos:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Valor incorrecto del operador de ID: {0}. Se esperaba un número." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Valor incorrecto del operador de ID: {0}. Se esperaba un número." @@ -2858,43 +2753,29 @@ msgstr "Error mientras se comunicaba con el servidor" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"El número de modificaciones actuales supera el máximo de modificaciones, el " -"actual es {0}, el máximo es {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Violación de la condición previa" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "{0} nodos en vía {1} supera el máximo número permitido de nodos {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Violación de la capacidades del API" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Advertencia: automáticamente truncando el valor de la etiqueta \"{0}\" en " -"la primitiva suprimida {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"La longitud del valor para la etiqueta \"{0}\" en la primitiva {1} excede la " -"máxima longitud permitida {2}. Los valores de longitud son {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Violación de la condición previa" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "{0} nodos en vía {1} supera el máximo número permitido de nodos {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2910,6 +2791,6 @@ msgstr "" "Las relaciones {0} son cíclicas (cada una se refiere a la otra)" -"
JOSM no puede enviarlas. Por favor: edite las relaciones y elimine la " -"dependencia cíclica." +"
JOSM no puede subirlas al servidor. Por favor: edite las relaciones y " +"elimine la dependencia cíclica." #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 @@ -3009,5 +2890,5 @@ msgstr "Establecer {0}={1} para {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -3024,5 +2905,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Doble conflicto" @@ -3127,4 +3008,19 @@ msgstr "Resolver los conflictos en el estado de borrado en {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3238,5 +3134,5 @@ msgstr "¿Aplicar?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3321,15 +3217,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "Atención: fallo al almacenar las preferencias en \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, 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:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3340,5 +3236,5 @@ "preferencias ''{0}'' no es un directorio." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3349,5 +3245,5 @@ "preferencias ''{0}'' no es un directorio." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3358,5 +3254,5 @@ "de preferencias desaparecido: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3367,5 +3263,5 @@ "directorio de preferencias desaparecido: {0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3375,5 +3271,5 @@ "preferencias por defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3384,5 +3280,5 @@ "archivo por defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3393,5 +3289,5 @@ "archivo de preferencias por defecto:{0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3403,5 +3299,5 @@ "defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3412,10 +3308,10 @@ "de preferencias por defecto. {0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3423,24 +3319,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Preferencias guardadas en {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "No se han podido subir las preferencias. Ya que: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "No se han podido cargar las preferencias desde el servidor." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3449,5 +3345,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3478,5 +3374,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3498,31 +3394,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "O" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Conjunto de cambios {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3532,5 +3421,5 @@ "incluida" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3544,27 +3433,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3572,5 +3461,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3582,5 +3471,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3588,25 +3477,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "H" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "Texto" #. column header: apply filter for children -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "C" msgstr "C" #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "I" msgstr "I" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "M" @@ -3614,43 +3503,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "R" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "A" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "D" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "Se esperaba un ID >=0. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "una proimitiva con id=0 no puede ser invisible" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "Se esperaba un ID >0. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "Se esperaba una versión > 0. Encontrada {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Paŕametro esperado ''{0}'' > 0, obtenido {1}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3658,5 +3559,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3684,10 +3585,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3695,7 +3592,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3710,5 +3607,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3728,146 +3625,138 @@ msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Vía de tipo área sin cerrar" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "La vía multipoligonal ''{0}'' no está cerrada." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Miembro ''{0}'' borrado en la relación." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Vía ''{0}'' con menos de dos puntos." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Se ha encontrado más de una vía \"desde\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Se ha encontrado más de una vía \"a\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Se ha encontrado más de un elemento \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Función ''{0}'' desconocida." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo de miembro \"{0}\" desconocido." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "No se ha encontrado ninguna vía \"desde\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "No se ha encontrado ninguna vía \"a\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "La vía \"desde\" no comienza o termina en un nodo \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "La vía \"a\" no comienza o termina en un nodo \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "La vía \"a\" no comienza o termina en la vía con rol \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "No se ha encontrado el estilo para la restricción {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersección entre las vías ''{0}'' y ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "La función \"{0}\" no es útil para el tramo \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "La no-vía ''{0}'' en multipolígono" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Ninguna vía exterior en el multipolígono ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "El estilo de la vía exterior ''{0}'' no coincide." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "sin etiquetar" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "texto" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "inactivo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "seleccionado" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3876,6 +3765,6 @@ msgstr[1] "nodos" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3884,7 +3773,8 @@ msgstr[1] "vías" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3893,21 +3783,37 @@ msgstr[1] "relaciones" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "vía sin etiquetar" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "vía incompleta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "fondo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "resaltar" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "sin etiquetar" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "texto" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -4051,5 +3957,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "ferrocarril" @@ -4065,7 +3971,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4081,4 +3987,10 @@ msgstr[1] "miembros {0}" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Conjunto de cambios {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4103,5 +4015,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193 msgid "Bad Request" -msgstr "Solicitud errónea" +msgstr "Petición errónea" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209 @@ -4110,6 +4022,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Conflicto" @@ -4123,7 +4035,7 @@ msgstr "Objeto borrado" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4208,74 +4120,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nombre de usuario" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Contraseña" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "opciones" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Mostrar esta ayuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Argumento de geometría standard de unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Bajar el rectángulo límite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Abrir archivo (como gps en bruto si es .gpx" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Bajar el rectángulo límite como gps en bruto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Seleccionar dentro de la búsqueda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Lanzar en modo maximizado" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Restablecer las preferencias a los valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Establezca el idioma." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "opciones proporcionadas como propiedades de sistema Java" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "Cambiar la carpeta para todas las configuraciones de usuario" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4288,9 +4200,9 @@ "utilizada." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "ejemplos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4300,36 +4212,36 @@ "asegúrese que carga algún dato antes de --seleccionar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "En vez de --bajar= puede especificar osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Activando los complementos actualizados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Cargando los primeros complementos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Ajustes predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Cargando los complementos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "La opción de configuración {0} ha sido eliminada porque ya no se usa." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Archivo" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4344,22 +4256,22 @@ msgstr "Editar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Herramientas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Predefinidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4367,5 +4279,5 @@ msgstr "Menú: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Audio" @@ -4444,13 +4356,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "Usuario:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "capa no listada" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4485,5 +4398,5 @@ msgstr "Inicializar" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4491,6 +4404,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4499,5 +4412,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4506,5 +4419,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4513,25 +4426,25 @@ msgstr[1] "Borrando {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "Borrar objetos" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "A borrar" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "Desde la relación" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "Pos." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4539,5 +4452,5 @@ msgstr "Función" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" @@ -4545,5 +4458,5 @@ "relaciones" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4577,11 +4490,11 @@ msgstr "La función {0} no participa en la pareja de comparación {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4590,6 +4503,6 @@ msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4597,6 +4510,6 @@ msgstr "Nodos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4604,23 +4517,23 @@ msgstr "Miembros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Ningún conflito de etiqueta pendiente de ser resuelto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Etiquetas ({0} conflictivas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} etiquetas conflictivas pendientes de ser resueltas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Nodos (resueltos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4629,17 +4542,17 @@ "lista de nodos de esta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Nodos (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Conflictos pendientes en la lista de nodos de esta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Miembros (resueltos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4649,21 +4562,21 @@ "lista de miembros de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Miembros (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "Conflictos pendientes en la lista de miembros de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Ningún conflicto de propiedades pendiente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Propiedades (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Conflictos de propiedades pendientes de resolver" @@ -4695,18 +4608,18 @@ msgstr "objeto {0} no encontrado en la lista" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "bloquear desplazamiento" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Comparar " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Mi versión" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" @@ -4714,5 +4627,5 @@ "locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4720,5 +4633,5 @@ msgstr "Versión fusionada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4728,10 +4641,10 @@ "la decisión de combinarlos." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Su versión" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" @@ -4739,18 +4652,18 @@ "del servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> arriba" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" "Copiar mis nodos seleccionados al inicio de la lista de nodos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> abajo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" @@ -4758,5 +4671,5 @@ "fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4766,5 +4679,5 @@ "la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4774,5 +4687,5 @@ "en la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4780,5 +4693,5 @@ "Copiar su elemento seleccionado al inicio de la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" @@ -4786,5 +4699,5 @@ "fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4794,5 +4707,5 @@ "la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4802,23 +4715,23 @@ "la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Subir" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Subir los elementos seleccionados una posición" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Bajar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Bajar las entradas seleccionadas una posición" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4829,28 +4742,28 @@ msgstr "Eliminar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "" "Eliminar las entradas seleccionadas de la lista de elementos fusionados" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Congelar" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Congelar" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Congelar la lista actual de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Desconjelar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Descongelar la lista de elementos fusionados y comenzar la fusión" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4861,5 +4774,5 @@ "las suyas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4870,5 +4783,5 @@ "las suyas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4877,5 +4790,5 @@ msgstr[1] "Mi versión ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4884,5 +4797,5 @@ msgstr[1] "Versión fusionada ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4891,5 +4804,5 @@ msgstr[1] "Su versión ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4899,5 +4812,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5150,10 +5063,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5163,10 +5076,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5254,9 +5167,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5264,6 +5177,6 @@ msgstr "ninguno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "todos" @@ -5352,7 +5265,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5362,6 +5275,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5471,4 +5384,57 @@ msgstr "Mostrar solo etiquetas con conflictos" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Eliminar objetos seleccionados." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Conjunto de cambios {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "Cargar del servidor la lista de su conjunto de cambios abiertos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Descargar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Descargar datos del mapa del servidor OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Cerrar los conjuntos seleccionados de cambios abiertos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Mostrar info" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Abrir un editor para la relación seleccionada" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5482,12 +5448,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5505,13 +5471,13 @@ msgstr "Pila de comandos: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "Resolver conflictos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5519,6 +5485,6 @@ "en la lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5527,25 +5493,25 @@ "Selecciona en el mapa los elementos seleccionados en la lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancelar la resolución de conflictos y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Aplicar la resolución de conflictos y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Aplicar resolución" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "Cerrar de todos modos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "Continuar resolviendo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5557,26 +5523,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "Conflicto no resuelto completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Resolver los conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Resolver los conflictos de ''{0}'" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5587,41 +5553,41 @@ msgstr "Añadir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "Añadir filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "Editar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "Borrar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "Subir filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "Bajar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "Activar filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "Ocultar elementos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "Aplicar también a los niños" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "Invertir filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "Modo de filtro" @@ -5661,5 +5627,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "Diálogo no creado todavía. Invocar primero createInstance()" @@ -5674,34 +5640,34 @@ msgstr "Abrir un listado de todas las capas cargadas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Borrar la capa seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Mostrar/Ocultar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Cambia estado de visibilidad de la capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Activar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Activa la capa selecionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Combina esta capa con otra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Mover la capa seleccionada una fila arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Mover la capa seleccionada una fila abajo" @@ -5711,5 +5677,179 @@ msgstr "Información de capa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relaciones" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Abrir una lista de todas las relaciones." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relaciones: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Abrir un editor para la relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Borrar la relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Crear un anueva relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +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." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Selección actual" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Abrir una ventana de selección." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Zoom a los elementos seleccionados" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Zoom a la selección" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Selección" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Selección: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Desacoplar el panel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Cerrar este panel. Lo puede reabrir con los botones en la barra de " +"herramientas de la izquierda." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Haga click para minimizar/maximizar el contenido del panel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Autores" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Abrir una lista de la gente trabajando en los objetos seleccionados" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} Autor" +msgstr[1] "{0} Autores" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "Seleccionar primitivas presentadas por este usuario" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "Lanza un buscador con información sobre el usuario" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" +"Fallo al crear una URL porque la codificación ''{0}''
no existe en " +"este sistema." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "Falta codificación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "Nº de objetos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "incompleto" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "vía sin salida" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Descargando conjunto de cambios..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5718,22 +5858,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "¿Modificar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5742,5 +5882,5 @@ msgstr[1] "Cambiar las propiedades de hasta {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5749,235 +5889,78 @@ msgstr[1] "Esto cambiará {0} objetos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Por favor, selecciona una etiqueta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Por favor, selecciona un valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "" "Por favor, seleccione los objetos a los que desea cambiar las propiedades." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Propiedades/Relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Propiedades de los objetos seleccionados." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Miembro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Añadir propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propiedades: {0} / Miembros: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Propiedades / Miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Borrar de la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "¿Seguro de eliminar la selección de la relación {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Borrar la clave seleccionada en todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Eliminar propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Añadir una nueva pareja clave/valor para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Editar el valor de la clave seleccionada para todos los objetos" -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relaciones" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Abrir una lista de todas las relaciones." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relaciones: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Abrir un editor para la relación seleccionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Borrar la relación seleccionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Crear un anueva relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "Crea una copia de esta relación y la abre en otra ventana de edición." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Selección actual" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Abrir una ventana de selección." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Zoom a los elementos seleccionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Zoom a la selección" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Selección" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Selección: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Desacoplar el panel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Cerrar este panel. Lo puede reabrir con los botones en la barra de " -"herramientas de la izquierda." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Haga click para minimizar/maximizar el contenido del panel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Autores" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Abrir una lista de la gente trabajando en los objetos seleccionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} Autor" -msgstr[1] "{0} Autores" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Mostrar info" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "Lanza un buscador con información sobre el usuario" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" -"Fallo al crear una URL porque la codificación ''{0}''
no existe en " -"este sistema." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "Falta codificación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Autor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "Nº de objetos" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 msgid "Edit the relation the currently selected relation member refers to." msgstr "" +"Editar la relación del miembro de la relación seleccionada actualmente " +"referida a." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220 @@ -6035,19 +6018,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Descargar todas las vías y nodos incompletos de esta relación" -msgstr[1] "Descargar todas las vías y nodos incompletos de esta relación" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Descargar relación de miembros" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Descargando relación {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -6058,21 +6040,19 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Parent Relations" -msgstr "" +msgstr "Relaciones padre" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 msgid "Child Relations" -msgstr "" +msgstr "Relaciones hijo" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Aplicar función" +msgstr "Aplicar función:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Fijar una función para los miembros seleccionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -6081,14 +6061,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "Eliminarlos, limpiar la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 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:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -6098,9 +6078,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -6110,42 +6090,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +"Añadir todas las primitivas seleccionadas al conjunto de datos actual antes " +"del primer miembro" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +"Añadir todas las primitivas seleccionadas al conjunto de datos actual antes " +"del último miembro" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " "member" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +"Añadir todas las primitivas seleccionadas al conjunto de datos actual antes " +"del primer miembro seleccionado" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " "member" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +"Añadir todas las primitivas seleccionadas al conjunto de datos actual antes " +"del último miembro seleccionado" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +"Seleccionar los miembros de la relación que se refieren a las primitivas de " +"la selección actual" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6153,70 +6143,72 @@ "selection" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +"Seleccionar los miembros de la relación que se refieren a {0} primitivas de " +"la selección actual" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +msgstr "Seleccionar primitivas para la relación de miembros señalada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "Ordenar los miembros de la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" msgstr "Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "Editor de relaciones: Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "Editor de relaciones: Mover arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "Editor de relaciones: Mover abajo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "Editor de relaciones: Borrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "Sí, crear un conflicto y cerrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "No, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6225,9 +6217,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "Conflicto en los datos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6236,49 +6228,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "Aplicar las actualizaciones actuales" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 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:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 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:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Añadir una etiqueta vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Descargar relación de miembros" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Descargar miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "Descargar relación de miembros" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 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:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Aplicar función" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6288,34 +6278,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "Sí, aplícalo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "No, no lo apliques" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "Confirmar función vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +"Editar la relación del miembro de la relación seleccionada actualmente " +"referida a" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "Ampliar a" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6341,13 +6333,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63 msgid "including immediate children of parent relations" -msgstr "" +msgstr "incluido los hijos inmediatos de las relaciones padre" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 msgid "Load parent relations" -msgstr "" +msgstr "Cargar relaciones padre" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 msgid "Loading parent relations" -msgstr "" +msgstr "Cargando relaciones padre" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -6412,12 +6404,14 @@ "maxlon): {0}, {1}, {2}, {3}" msgstr "" +"Área de descarga actual (minlat,minlon, maxlat, " +"maxlon): {0}, {1}, {2}, {3}" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" -msgstr "" +msgstr "Crear marcador" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" -msgstr "" +msgstr "Añadir un marcador para la zona de descarga seleccionada" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 @@ -6427,10 +6421,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." -msgstr "" +msgstr "Por favor, introduzca un nombre el marcador del área de descarga" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6438,9 +6432,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +msgstr "Eliminar los marcadores actualmente seleccionados" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" -msgstr "" +msgstr "Renombrar el marcador actualmente seleccionado" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 @@ -6523,9 +6517,4 @@ msgid "Download Area" msgstr "Descargar área" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Descargar" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6828,6 +6817,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6840,6 +6827,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -7110,4 +7095,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7330,5 +7319,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7371,116 +7360,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Nombre" @@ -7504,15 +7493,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Tipo" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7683,10 +7672,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7694,5 +7683,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7700,9 +7689,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7817,6 +7806,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "desconocido" @@ -7838,13 +7827,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Changeset info" msgstr "Información del conjunto de cambios" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7879,4 +7868,133 @@ msgstr "Versión" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Sincronizar únicamente el nodo {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Sincronizar únicamente la vía {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Sincronizar únicamente la relación {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Sincronizar el conjunto de datos completo" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"La subida falló debido a que el servidor tiene una " +"versión más reciente de uno
de sus nodos, vías o relaciones.
El " +"conflicto es causado por el {0} con ID {1}," +"
el servidor tiene la versión {2}, su versión es {3}.

Pulse " +"{4} para sincronizar los primitivos en conflicto únicamente." +"
Pulse {5} para sincronizar el conjunto de datos local " +"completo con el servidor.
Pulse {6} para abortar y " +"continuar editando.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Se han detectado conflictos" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"La subida falló porque el servidor tiene una versión " +"más reciente de uno
de sus nodos, vías o relaciones.

Pulse " +"{0} para sincronizar el conjunto de datos local completo con el " +"servidor.
Pulse {1} para abortar y continuar editando." +"
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"El envío de datos falló debido a que se ha " +"empleado
un conjunto de cambios {0} que se cerró previamente ({1})." +"
Vuelva a enviar los datos de nuevo con un conjunto de cambios nuevo o " +"uno existente y abierto." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Conjunto de cambios cerrados" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "Preparar la resolución de conflictos" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "Haz click para cancelar y continuar editando el mapa" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "Nodo todavía en uso" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Introduzca un breve comentario sobre los cambios que se van a subir:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7895,39 +8013,151 @@ msgstr "No abrir un conjunto de cambios" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Abrir un nuevo conjunto de cambios" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" +"Abrir un nuevo conjunto de cambios y usarlo en la siguiente subida de datos" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Actualizando conjunto de cambios..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Subir datos a un conjunto de cambios abierto" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "Cerrar conjunto de cambios despues de subir los datos" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "Cargar del servidor la lista de su conjunto de cambios abiertos" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +"Por favor, seleccione el conjunto de cambios que desea cerrar" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +msgstr "Abrir conjunto de cambios" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Cerrar conjuntos de cambios" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +msgstr "Cerrar los conjuntos seleccionados de cambios abiertos" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +msgstr "Cancelar el cierre de los conjuntos de cambios" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Cerrando conjunto de cambios" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Grabar nombre de usuario y contraseña (sin cifrar)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Por favor, introduzca su nombre de usuario" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Por favor, introduzca una etiqueta sobre su traza" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Advertencia: La contraseña se transferirá sin cifrar." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Atletismo" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Alcanzar una intersección" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "Seleccione nombre de fichero" @@ -7967,5 +8197,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" -msgstr "" +msgstr "Ningún archivo asociado a esta capa" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 @@ -7994,17 +8224,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "Cambios sin guardar. ¿Guardarlos/subirlos antes de salir?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "Cambios sin guardar. ¿Guardarlos/subirlos antes de borrar?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -8017,9 +8247,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "Datos sin guardar y conflictos" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -8033,9 +8263,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "Datos sin guardar y pérdida de archivo asociado" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -8050,52 +8280,52 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "Datos sin guardar de archivos no modificables" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Descartar y salir" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "Salir de JOSM sin guardar. Los cambios sin grabar se perderán." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "Descartar y borrar" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "Eliminar capas sin guardar. Los cambios sin grabar se perderán." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +msgstr "Grabar/subir y salir" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" "Salir de JOSM sin guardar. Los cambios sin grabar se subirán y/o guardarán." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "Grabar/subir y borrar" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" "Guardar/subir capas antes de eliminar. Los cambios sin grabar no se perderán." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "Preparando capa ''{0}'' para subir..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -8103,5 +8333,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -8174,40 +8404,384 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Subir" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Cargando objetos" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Preferencias" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "Etiquetas del nuevo conjunto de cambios" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" +"Abrir un nuevo conjunto de cambios y usarlo en la siguiente subida de datos" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "avanzado" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Configurar los complementos disponibles." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Subiendo datos de la capa \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Subir cambios" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Etiquetas del conjunto de cambios {0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" +"Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando " +"esta primitiva e intentando volver a enviar los cambios." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "Preparando primitivas para subir" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Subiendo datos de la capa \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +#, fuzzy +msgid "Click to return to the Upload Dialog" +msgstr "Haga clic para cerrar el cuadro de diálogo" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Acerca de" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Clic para anular la fusión de nodos" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "{0} objeto para eliminar:" +msgstr[1] "{0} objetos para eliminar:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Información del conjunto de cambios" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "Subiendo {0} objetos..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Por favor, seleccione la fila a borrar" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "Subir datos en una única petición" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "Subir los datos en grupos de objetos. Tamaño del grupo: " + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "Subir cada objeto individualmente" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" +"Abrir un nuevo conjunto de cambios y usarlo en la siguiente subida de datos" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "(1 petición)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "(nº de pediticiones desconocida)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "({0} petición)" +msgstr[1] "({0} peticiones)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Objetos que añadir:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Objetos que modificar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Objetos que eliminar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8216,5 +8790,5 @@ msgstr[1] "{0} objetos para añadir:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8223,5 +8797,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8230,213 +8804,37 @@ msgstr[1] "{0} objetos para eliminar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Subir cambios" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Por favor, introduzca las coordenadas deseadas primero." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Introduzca un breve comentario sobre los cambios que se van a subir:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "Abrir un nuevo conjunto de cambios" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" -"Abrir un nuevo conjunto de cambios y usarlo en la siguiente subida de datos" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "Usar un nuevo conjunto de cambios" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Subir datos a un conjunto de cambios abierto" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "Cerrar conjunto de cambios despues de subir los datos" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Etiquetas del conjunto de cambios {0}" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando " -"esta primitiva e intentando volver a enviar los cambios." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "Preparando primitivas para subir" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "Atención: fallo al almacenar las preferencias en \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Subir al servidor todos los cambios en una sola solicitud" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "Solicitud errónea" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} metros" -msgstr[1] "{0} metros" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Por favor, introduce una cadena de caracteres como filtro" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "punto GPS" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Personalice el dibujo de línea" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Usar las preferencias globales" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Dibujar líneas entre puntos para esta capa" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "No dibujar líneas entre puntos para esta capa" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Seleccione las opciones de dibujo de línea" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8444,5 +8842,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8451,5 +8849,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8531,5 +8929,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Descripción" @@ -8561,10 +8959,10 @@ msgstr[1] "{0} nodos de vía" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Convertir en capa de datos" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8574,12 +8972,12 @@ "peligroso.
Si quiere subir trazas, consulte aquí:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces (EN)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8588,29 +8986,29 @@ msgstr "Convertido desde: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Descargar datos de OSM a lo largo de esta traza" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Descargar todo entre:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Área máxima por petición:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8621,9 +9019,9 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "No hay traza gpx disponible en la capa para asociar el audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8634,5 +9032,5 @@ "comienzo." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8642,23 +9040,23 @@ "tiempos fueran razonablemente estimados se han omitido." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "fuera del área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "versión {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8667,5 +9065,5 @@ msgstr[1] "Se han detectado {0} conflictos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8679,5 +9077,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8694,11 +9092,11 @@ "dialogo de Conflictos y resuélvalos manualmente." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8707,36 +9105,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} formado por:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "sin ajustar" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "Versión del API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Convertir a capa de gpx" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8744,5 +9142,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8751,5 +9149,5 @@ msgstr[1] "trazas" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8757,5 +9155,5 @@ msgstr[1] "puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8764,5 +9162,5 @@ msgstr[1] "una traza con {0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8771,5 +9169,5 @@ msgstr[1] "{0} formado por las trazas {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8778,24 +9176,24 @@ msgstr[1] "{0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Archivos GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "El archivo {0} ya está cargado con el nombre \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Error mientras se analizaba sintácticamente {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "No se pudo leer \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8807,34 +9205,34 @@ "lee en la foto y seleccione una zona horaria

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Hora de la foto (desde exif)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Hora del Gps (leída desde la foto tomada): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/aaaa hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Yo estoy en la zona horaria de: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Sin fecha" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Abrir otra foto" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "sincronizar el tiempo de una foto con el receptor GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8844,157 +9242,117 @@ "Por favor, utilice el formato requerido." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Fecha no válida" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "Traza GPX: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Abrir otra traza gpx" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Estimación automática" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Actualizar posición para: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Zona horaria: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Ajuste:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"No puedo tomar una imagen de mi receptor GPS
¿Puede ayudarme?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Actualizar posición para: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Todas las imágenes" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Imágenes sin la posición exif" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Fotos no etiquetadas todavía" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "¡No hay nada seleccionado!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Ajustadas al track GPS {0} de {1} fotografías" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Correlacionar las imágenes con la traza GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Correlación" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Estimación automática" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Debe seleccionar una traza GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "No se ha seleccionado una traza GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Error al analizar la zona horaria.\n" -"Formato esperado: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 msgid "Invalid timezone" msgstr "Zona horaria no válida" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Error mientras se realizaba el análisis sintáctico.\n" -"Formato esperado: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 msgid "Invalid offset" msgstr "Desplazamiento inválido" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Encontrado {0} coincidencias de{1} en la traza GPX {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Traza GPX cargada" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" -"Las fotografías seleccionadas no contienen información sobre la hora en que " -"fueron tomadas." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Las fotografías no contiene información horaria" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"La traza GPX seleccionada no contiene información temporal. Por favor, " -"seleccione otra." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "La traza GPX no posee información horaria" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Calco" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 #, java-format msgid "Timezone: {0}" msgstr "Zona horaria: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 #, java-format msgid "Minutes: {0}" msgstr "Minutos: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 #, java-format msgid "Seconds: {0}" msgstr "Segundos: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Ajustadas al track GPS {0} de {1} fotografías" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" msgstr "(Diferencia horaria de {0} días)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Diferencia temporal entre la traza y las fotografías: {0}m {1}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9005,68 +9363,111 @@ "manual." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 msgid "Matching photos to track failed" msgstr "Ajuste de fotografías a traza fallido" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 msgid "Adjust timezone and offset" msgstr "Ajustar zona horaria y la diferencia temporal" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Valores por defecto" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" +"Las fotografías seleccionadas no contienen información sobre la hora en que " +"fueron tomadas." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Las fotografías no contiene información horaria" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"La traza GPX seleccionada no contiene información temporal. Por favor, " +"seleccione otra." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "La traza GPX no posee información horaria" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 +msgid "You should select a GPX track" +msgstr "Debe seleccionar una traza GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 +msgid "No selected GPX track" +msgstr "No se ha seleccionado una traza GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Error al analizar la zona horaria.\n" +"Formato esperado: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Error mientras se realizaba el análisis sintáctico.\n" +"Formato esperado: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Extrayendo localizaciones GPS del EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Iniciando escaneo del directorio" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "Uno de los archivos seleccionados era nulo" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Leyendo fotos..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Leyendo {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Imposible obtener ruta apropiada para el directorio {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Escaneando directorio {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Encontrado archivo nulo en el directorio {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Error mientras se obtenían archivos del directorio {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Imagenes Geoetiquetadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Correlacionar con GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -9074,52 +9475,100 @@ msgstr[1] "imagenes" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "Se encontraron {0} geoetiquetadas." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Siempre mover y no mostrar la ventana de diálogo de nuevo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "El archivo no se encuentra." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Ninguna imagen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Cargando {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Error en archivo {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Mostrar fotos geoetiquetadas" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Anterior" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Imagen anterior" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Página web: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Eliminar foto de la capa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Borrar de la relación" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Siguiente" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Imagen siguiente" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Centrar vista" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Zoom a mejor ajuste y 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -9130,5 +9579,5 @@ "Altitud: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9233,4 +9682,12 @@ msgid "Error displaying URL" msgstr "Error mostrando la URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9466,7 +9923,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Todo" @@ -9537,6 +9993,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Bicicleta" @@ -9940,31 +10396,95 @@ msgstr "No se ha podido activar la proyección {0}. Usando Mercator." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Habilitar servidor proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anónimo" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Albergue" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Puerto:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Contraseña" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Preferencias del proxy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Servidor proxy del host" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Puerto del servidor proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Usuario del servidor proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Contraseña del servidor proxy" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "La URL base del servidor OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "Nombre de usuario (correo-e) a la cuenta OSM" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Validar contraseña de la cuenta OSM. Dejar en blanco para no guardar ninguna " +"clave." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "URL base del servidor" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "Nombre de usuario OSM (correo-e)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "Contraseña OSM" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"ADVERTENCIA: La clave es almacena en texto plano en el archivo de " +"preferencias.
La contraseña es transferida en texto plano al servidor, " +"codificada en la URL.
No utilice claves valiosas." #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10271,5 +10791,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10279,13 +10799,13 @@ msgstr[1] "Eliminar las claves antiguas de hasta {0} objectos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "Añadir una nueva etiqueta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +msgstr "Borrar la selección en la tabla de etiquetas" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10293,18 +10813,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Atributos opcionales" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "vía sin salida" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Tipo desconocido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10315,16 +10835,16 @@ msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Error analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Los elementos del tipo {0} son soportados" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10333,18 +10853,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "¡No hay nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "¡Selección inadecuada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Cambiar propiedades" @@ -10373,4 +10893,14 @@ msgstr "Descargando puntos {0} al {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +#, fuzzy +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" +"Valor ilegal para el atributo ''{0}'' en la etiqueta XML ''{1}''. Obtenido " +"{2}." + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10386,12 +10916,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, Posiblemente faltan algunas etiquetas." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Preparando datos..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "Número de columnas inexperado {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10496,16 +11081,16 @@ "documento gpx" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10515,51 +11100,53 @@ msgstr "Descargando datos OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Obteniendo nodo con ID {0} de ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Obteniendo vía con ID {0} de ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Obteniendo relación con ID {0} de ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Obteniendo un conjunto de nodos de ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Obteniendo un conjunto de vías de ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Obteniendo un conjunto de relaciones de ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " "for each primitive." msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +"El servidor responde con el código de respuesta 404, reintentando con una " +"petición individual para cada primitiva." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Descargando puntos {0} al {1}..." -msgstr[1] "Descargando puntos {0} al {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10596,34 +11183,32 @@ msgstr "¡Fallo en la importación NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "Esta versión de JOSM es incompatible con el servidor configurado" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"Soporta versiones 0.5 y 0.6 del protocolo, pero el servidor dice que soporta " -"{0} a {1}" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Establecidas comunicaciones con {0} usando la versión de protocolo {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10631,66 +11216,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Conjunto de cambios {0} abierto con éxito" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Actualizando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "Actualizando conjunto de cambios {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Cerrando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Sin nuevos cambios que enviar" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Preparando…" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Subiendo..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Comenzando a subir en un única petición..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Subiendo {0} objetos..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "Esperando 10 segundos... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Reintentando {0} de {1} en {2} segundos..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "OK - intentando de nuevo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "Reintentando {0} de {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "El conjunto de cambios actual es nulo. Los datos no se pueden subir." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10717,4 +11313,14 @@ msgid "Invalid bz2 file." msgstr "Archivo bz2 inválido" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10725,5 +11331,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10750,5 +11356,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10756,5 +11362,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10767,5 +11373,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10774,64 +11380,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 msgid "Parsing list of changesets..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Contraseña o nombre de usuario incorrectos" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Advertencia: La contraseña se transferirá sin cifrar." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Grabar nombre de usuario y contraseña (sin cifrar)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Introduzca contraseña" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Inicio de sesión" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "La URL base del servidor OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "Nombre de usuario (correo-e) a la cuenta OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Validar contraseña de la cuenta OSM. Dejar en blanco para no guardar ninguna " -"clave." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "URL base del servidor" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "Nombre de usuario OSM (correo-e)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "Contraseña OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"ADVERTENCIA: La clave es almacena en texto plano en el archivo de " -"preferencias.
La contraseña es transferida en texto plano al servidor, " -"codificada en la URL.
No utilice claves valiosas." +msgstr "Analizando la lista de cambios..." #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10929,5 +11479,12 @@ msgstr "El archivo \"{0} no existe" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10936,38 +11493,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "Valor ilegal del atributo \"ref\" del elemento . Es {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10975,19 +11532,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Especificación incompleta sin ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Objeto con id=0 ilegal" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10997,8 +11554,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -11008,25 +11565,45 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Versión del API desconocida o no soportada. Es {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" +"Valor ilegal para el atributo ''{0}'' en la etiqueta XML ''{1}''. Obtenido " +"{2}." + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" +"Valor ilegal para el atributo ''{0}'' en la etiqueta XML ''{1}''. Obtenido " +"{2}." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -11034,5 +11611,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -11041,5 +11618,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -11047,5 +11624,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -11054,13 +11631,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Preparando datos OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "Analizando los datos de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "Preparando conjunto de datos..." @@ -11083,20 +11660,32 @@ msgstr "Descargando relaciones referidas..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." -msgstr "Leyendo conjunto de cambios..." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "Descargando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "Leyendo conjunto de cambios {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." +msgstr "Descargando conjunto de cambios {0}..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Descargando conjunto de cambios..." +msgstr[1] "Descargando conjunto de cambios..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." msgstr "Descargando conjunto de cambios {0}..." @@ -11116,7 +11705,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "inexperado valor del parámetro \"index\". Obtenido {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -11125,9 +11714,5 @@ msgstr "Fallo al abrir la conexión de la API {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "Error: fallo al añadir credenciales de autentificación a la conexión." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11182,21 +11767,25 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "inexperado valor del parámetro \"index\". Obtenido {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 -#, fuzzy msgid "Starting to upload in chunks..." -msgstr "Comenzando a subir en un única petición..." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format msgid "({0}/{1}) Uploading {2} objects..." -msgstr "Subiendo {0} objetos..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Subiendo datos..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Primitivas movidas o borradas" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11238,12 +11827,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Borrar {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Error al borrar el archivo del complemento: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11395,9 +11984,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "no hay descripción disponible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Más detalles" @@ -11529,4 +12118,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "inexperado valor del parámetro \"index\". Obtenido {0}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Paŕametro esperado ''{0}'' > 0, obtenido {1}" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11842,6 +12446,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Subir trazas" @@ -11928,5 +12532,5 @@ msgstr "Subiendo traza GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Trazas subidas a openstreetmap.org" @@ -11937,5 +12541,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Direcciones interpoladas" @@ -11950,11 +12554,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Impar" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Par" @@ -11965,24 +12566,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Número" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "espacio natural" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "sitio" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Alquiler" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -12000,7 +12597,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "segmento interior" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -12069,7 +12665,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 -#, fuzzy msgid "Expected valid number for address increment" -msgstr "Se preveía número de portal impar" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 @@ -12123,5 +12718,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -12183,21 +12778,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Seleccionar comuna" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Elegir desde..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Catastro" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Digitalización automática" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12206,13 +12801,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM está detenido para que el cambio surta efecto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12239,17 +12834,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Activar caché automático" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Tamaño máximo de caché (en MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12267,9 +12862,9 @@ "creado mediante este componente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "WMS del catastro francés" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -12277,10 +12872,10 @@ "activo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Fuente" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12290,5 +12885,5 @@ "preferencias de JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12298,9 +12893,9 @@ "intermedios. Útil para los textos sobre fondos oscuros." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Permitir múltiples capas apiladas" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -12308,5 +12903,5 @@ "transparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" @@ -12314,32 +12909,32 @@ #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Graba las imágenes más pequeñas (mejor calidad pero mayor uso de memoria)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Fijar tamaño del cuadrado (por defecto 100 m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Tamaño fijado (desde 25 a 100 m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -12347,9 +12942,6 @@ "tamaño" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Etiquetado automático de la fuente añadida:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "¿Añadir etiqueta sobre la fuente a los elementos (source=...)?" @@ -12554,5 +13146,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Localización" @@ -12752,5 +13344,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "No se han cargado los datos." @@ -12772,9 +13364,9 @@ msgstr "Convertir a capa GPX con tiempo anonimizado" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "editar trazas GPX" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "Editar GPX" @@ -13163,7 +13755,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "lámina de agua" @@ -13324,19 +13916,19 @@ msgstr "No se a podido adquirir la imagen" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Conectando" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Conectado" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "No conectado" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Falló la conexión" @@ -13375,33 +13967,33 @@ msgstr "Capa LiveGPS" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Capturar traza GPS" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" "Conectar al servidor gpsd y mostrar la posición actual en la capa LiveGPS." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Centrar una vez" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Centrar la capa LiveGPS a la posición actual." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Autocentrar" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Centrar continuamente la capa LiveGPS a la posición actual." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13453,9 +14045,9 @@ msgstr "No se puede dibujar fuera del mundo." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "Modo de mediciones" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Mediciones" @@ -13495,5 +14087,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13504,14 +14096,14 @@ msgstr "Crear multipolígono." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" "Una de las vías seleccionadas es en realidad parte de otro multipolígono." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "El multipolígono debe consistir únicamente de vías cerradas." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "Debes seleccionar al menos dos vías" @@ -13665,5 +14257,5 @@ msgstr "Ejecutable Firefox" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13759,5 +14351,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13833,41 +14425,41 @@ msgstr "Introduzca el peso de los valores" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Mapa desplazable" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "Auto Zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Cargar tesela" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "Mostrar información de la tesela" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Cargar todas las teselas" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Incrementar zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Reducir zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "Ajustar al tamaño de la tesela" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "Alinear caché de teselas" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "imagen " @@ -14042,4 +14634,43 @@ "preferencias." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Par" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Menor número" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Mayor número" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Calles/Carreteras" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Mayor número" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -14058,42 +14689,20 @@ msgstr "Invertir edificios adosados" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Adosar un edificio" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Crear edificios individuales a partir de un gran edificio." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Seleccione una vía cerrada de al menos cuatro puntos." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Edificios entre medianeras" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Mayor número" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Menor número" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolación" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Nombre de la calle" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Opcional" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14108,5 +14717,5 @@ msgstr "Sin validación de errores" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Rejilla" @@ -14782,38 +15391,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "edificio" @@ -14827,5 +15406,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "área" @@ -14951,10 +15530,10 @@ msgstr "No se pudo leer la información de walking-papers.org el id \"{0}\"" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Walking Papers: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15161,7 +15740,7 @@ msgstr "" "La URL base
''{0}''
para esta capa WMS no finaliza con un ''&'' " -"ni con un ''?''.
Esto puede dar lugar a una solicitud WMS no válida. " -"Debes comprobar la
configuración de tus preferencias.
¿Quieres " -"descargar las teselas WMS de todos modos?" +"ni con un ''?''.
Esto puede dar lugar a una solicitud WMS no válida. Debe " +"comprobar la
configuración de sus preferencias.
¿Quiere descargar las " +"teselas WMS de todos modos?" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 @@ -15177,6 +15756,6 @@ "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -"El área solicitada es demasiado grande. Por favor, acerque el zoom un poco, " -"o cambe la resolución" +"El área solicitada es demasiado grande. Por favor, amplíe el zoom un poco " +"más, o cambie la resolución" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 @@ -15227,5 +15806,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" -msgstr "" +msgstr "Fijar marcador WMS" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -15310,6 +15889,6 @@ "area, or use planet.osm" msgstr "" -"Has solicitado demasiados nodos (>50.000). Descarga un área más pequeña o " -"usa planet.osm" +"Ha solicitado demasiados nodos (>50.000). Descargue un área más pequeña o " +"use el archivo planet.osm" #. OSM server message @@ -15325,5 +15904,5 @@ msgstr "" "El tamaño máximo de bbox es de 0,25 y su solicitud fue demasiado grande. " -"Solicite un área más pequeña o utilice planet.osm" +"Solicite un área más pequeña o utilice el archivo planet.osm" #. OSM server message @@ -15729,6 +16308,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Referencia" @@ -16174,5 +16753,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Anchura (metros)" @@ -16290,5 +16869,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "metal" @@ -16300,5 +16879,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "bosque" @@ -16556,4 +17135,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16585,8 +17167,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "sí" @@ -16734,9 +17318,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "no" @@ -16788,5 +17373,5 @@ #: build/trans_presets.java:1052 msgid "Motorcycle" -msgstr "Moto" +msgstr "Motocicleta" #. item "Barriers/Cattle Grid" check "Motorcycle" @@ -16809,5 +17394,5 @@ #: build/trans_presets.java:1053 msgid "Motorcar" -msgstr "Coche" +msgstr "Automóvil" #: build/trans_presets.java:343 @@ -16817,5 +17402,5 @@ #: build/trans_presets.java:344 msgid "Motorboat" -msgstr "Barco a motor" +msgstr "Embarcación a motor" #: build/trans_presets.java:345 @@ -16981,5 +17566,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "calle urbana" @@ -17014,5 +17599,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "vía de servicio" @@ -17046,6 +17631,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "en construcción" @@ -17095,5 +17680,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "rotonda" @@ -17282,6 +17867,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Sendero" @@ -17402,5 +17987,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17426,4 +18010,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17433,15 +18018,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operador" @@ -17653,7 +18238,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Altitud" @@ -18072,5 +18657,5 @@ msgstr "ciénaga" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -18080,5 +18665,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "marísma" @@ -18604,32 +19189,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Horario de apertura" @@ -18688,91 +19273,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "24/7" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "Lu-Vie 08:30-20:00" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00" @@ -18787,5 +19372,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18804,7 +19389,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Número de referencia" @@ -18820,5 +19405,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "subterráneo" @@ -18831,6 +19416,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "De pago" @@ -18869,22 +19454,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Concesionario" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Editar concesionario de automóviles" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Taller" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Editar reparación de automóviles" @@ -18892,5 +19465,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Alquiler" @@ -18899,10 +19472,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Editar alquiler de automóviles" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Compartido" @@ -18910,5 +19483,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Editar automóviles compartidos" @@ -18916,10 +19489,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Editar aparcamiento para bicicletas" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Capacidad (Coches)" @@ -18928,22 +19501,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Editar alquiler de bicicletas" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Editar tienda de bicicletas" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Transporte público" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18953,5 +19519,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18959,5 +19525,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Referencia" @@ -18965,5 +19531,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Apeadero de ferrocarril" @@ -18971,5 +19537,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Editar apeadero" @@ -18977,5 +19543,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Parada de tranvía" @@ -18984,5 +19550,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Editar parada de tranvía" @@ -18990,5 +19556,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Andén de ferrocarril" @@ -18997,5 +19563,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Editar andén de ferrocarril" @@ -19007,5 +19573,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Referencia (número de pista)" @@ -19013,10 +19579,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Área" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Boca de metro" @@ -19025,10 +19591,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Editar boca de metro" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Silla de ruedas" @@ -19037,5 +19603,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Estación de autobús" @@ -19044,5 +19610,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Editar estación de autobús" @@ -19050,5 +19616,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Parada de autobús" @@ -19058,5 +19624,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Editar parada de autobús" @@ -19065,17 +19631,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Refugio" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Banco" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Andén de autobús" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Editar andén de autobús" @@ -19083,5 +19657,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -19089,5 +19663,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Editar parada de taxi" @@ -19095,5 +19669,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Aeropuerto" @@ -19101,15 +19675,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Editar Aeropuerto" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -19117,10 +19691,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Turismo" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Alojamiento" @@ -19132,5 +19706,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -19139,15 +19713,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Editar hotel" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Estrellas" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motel" @@ -19155,20 +19729,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Editar motel" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Pensión" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Editar pensión" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Cabaña o bungalow" @@ -19176,10 +19750,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Editar cabaña o bungalow" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Albergue" @@ -19187,30 +19761,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Editar albergue" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Cabaña alpina" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Editar cabaña alpina" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Zona de caravanas" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Editar zona de caravanas" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Lugar de acampada" @@ -19218,10 +19792,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Editar lugar de acampada" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Comida+Bebidas" @@ -19232,5 +19806,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurante" @@ -19238,5 +19812,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Editar restaurante" @@ -19244,5 +19818,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Cocina" @@ -19250,61 +19824,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italiano" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "chino" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizzería" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamburguesería" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "griego" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "alemán" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "india" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "regional" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turco" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asiático" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "tailandés" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexicano" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japonés" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Establecimiento de comida rápida" @@ -19312,9 +19886,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Editar establecimiento de comida rápida" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Cafetería" @@ -19322,9 +19896,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Editar cafetería" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pub" @@ -19332,18 +19906,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Editar pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Editar biergarten" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Bar" @@ -19351,9 +19925,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Editar Bar" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Club nocturno" @@ -19361,24 +19935,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Editar club nocturno" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turismo" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Atracción" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Editar atracción" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museo" @@ -19386,9 +19960,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Editar museo" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -19397,9 +19971,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Editar zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Panorámica" @@ -19407,24 +19981,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Editar panorámica" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Torre de vigía" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Parque temático" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Editar parque temático" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Trabajo artístico" @@ -19432,5 +20006,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Editar trabajo artístico" @@ -19438,19 +20012,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Oficina de información" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Mapa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "Grado de detalle" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "topográfico" @@ -19488,5 +20062,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19494,28 +20068,28 @@ msgstr "calle" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "esquema" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "Mostrar área" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "sitio" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "ciudad" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "región" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Descripción detallada" @@ -19525,5 +20099,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "Rutas mostradas para:" @@ -19531,6 +20105,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Ciclismo" @@ -19538,5 +20112,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "Bicicleta de montaña" @@ -19544,6 +20118,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Esquí" @@ -19551,5 +20125,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "Equitación" @@ -19557,46 +20131,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "... otros mods de transporte posible" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Panel informativo" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "Tablón de anuncios" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "aviso" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "historia" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "naturaleza" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "vida salvaje" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "plantas" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "Poste indicador" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "Punto de información" @@ -19604,29 +20178,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "Descripción detallada" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1769 msgid "Audioguide" msgstr "Audioguía" #. -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" msgstr "¿Audioguía a través de telefono móvil?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 +#: build/trans_presets.java:1780 msgid "Phone number" msgstr "Número de teléfono" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Otros Puntos de Información" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Editar refugio" @@ -19634,25 +20208,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Barbacoa" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Zona de picnic" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Editar zona de picnic" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Lugares históricos" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Castillo" @@ -19661,19 +20235,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Editar castillo" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruinas" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Editar ruinas" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Lugar arqueológico" @@ -19682,9 +20256,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Editar lugar arqueológico" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Campo de batalla" @@ -19692,10 +20266,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Editar campo de batalla" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "Sitio paleontológico" @@ -19703,5 +20277,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "Editar sitio paleontológico" @@ -19709,15 +20283,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monumento" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Editar monumento" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Monumento conmemorativo" @@ -19725,55 +20299,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Editar monumento conmemorativo" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Crucero" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Editar crucero" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Humilladero" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Editar humilladero" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "Mojón" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "Editar mojón" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Ocio" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Parque acuático" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Editar parque acuático" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Zona de juegos" @@ -19781,35 +20355,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Editar zona de juegos" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Pesca" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Editando pesca" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Deportes" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Instalaciones deportivas" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Estadio" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Editar estadio" @@ -19823,6 +20397,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "seleccionar deporte:" @@ -20214,30 +20788,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "deporte" @@ -20247,225 +20821,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "diversos" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "tiro con arco" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "atletismo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "fútbol australiano" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "béisbol" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "baloncesto" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "boules" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "bolos" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "piragua" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "escalada" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "Cricket con redes" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "croquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "ciclismo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "carrera de perros" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "hípica" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "fútbol" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gimnasia" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hockey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "carrera de caballos" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "motor" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota vasca" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "raqueta" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "tiro" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "monopatín" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "patinaje" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "esquí" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "Fútbol" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "natación" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "tenis de mesa" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tenis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Polideportivo" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Editar polideportivo" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Campo de juego" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Editar campo de juego" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Pista de carreras" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Editar pista de carreras" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Campo de golf" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Editar campo de golf" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Mini golf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Editar mini golf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Deporte" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Multi" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Editar multi" @@ -20504,21 +21078,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "tipo" @@ -20557,203 +21131,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "campo de juego" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "Polideportivo" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "Estadio" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "pista" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "Bowling" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Editar bowling" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Atletismo" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Editar atletismo" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Tiro con arco" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Editar tiro con arco" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Alpinismo" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Editar alpinismo" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Piragüismo" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Editar piragüismo" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Editar ciclismo" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Carreras de perros" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Editar carreras de perros" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Hípica" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Editar hípica" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Carreras de caballos" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Editar carreras de caballos" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gimnasia" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Editar gimnasia" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Deportes de motor" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Editar deportes de motor" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Patinaje" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Editar patinaje" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Monopatín" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Editar monopatín" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Natación" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Editar natación" @@ -20761,56 +21335,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Editar esquí" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Tipo de pista de esquí" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "de descenso" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "nórdico" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "parque de snowboard" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Dificultad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "novato" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "fácil" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "intermedio" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "avanzado" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "experto" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "fuera de pista" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Tiro" @@ -20818,182 +21392,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Editar tiro" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Deporte (Pelota)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Fútbol" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Editar fútbol" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Fútbol americano" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Editar fútbol americano" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Fútbol australiano" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Editar fútbol australiano" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Béisbol" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Editar béisbol" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Baloncesto" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Editar baloncesto" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Editar golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "campo de golf" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Editar boule" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Bolos" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Editar bolos" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Edit cricket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Cricket con redes" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Editar cricket con redes" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Editar croquet" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Editar hockey" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota vasca" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Editar pelota vasca" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Raqueta" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Editar raqueta" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Editar rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Ping-pong" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Editar ping-pong" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Editar tenis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "Artificial" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Edificios" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Edificio" @@ -21001,5 +21575,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Edificio público" @@ -21007,10 +21581,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Editar edificio público" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Ayuntamiento" @@ -21018,10 +21592,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Editar ayuntamiento" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Embajada" @@ -21029,10 +21603,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Editar embajada" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Juzgado" @@ -21041,10 +21615,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Editar juzgado" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Prisión" @@ -21053,10 +21627,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Editar prisión" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Policía" @@ -21066,10 +21640,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Editar policía" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Parque de bomberos" @@ -21078,10 +21652,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Editar parque de bomberos" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Oficina postal" @@ -21089,5 +21663,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Editar oficina postal" @@ -21095,15 +21669,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Jardín de infancia" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Editar jardín de infancia" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Escuela" @@ -21111,10 +21685,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Editar escuela" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Universidad" @@ -21122,10 +21696,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Editar universidad" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Instituto de enseñanza secundaria" @@ -21133,5 +21707,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Editar instituto de enseñanza secundaria" @@ -21139,5 +21713,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Cine" @@ -21146,10 +21720,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Editar cine" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Biblioteca" @@ -21158,9 +21732,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Editar biblioteca" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Centro de arte" @@ -21168,10 +21742,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Editar centro de arte" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Teatro" @@ -21180,10 +21754,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Editar teatro" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Lugar de culto" @@ -21193,5 +21767,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Editar lugar de culto" @@ -21200,6 +21774,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religión" @@ -21208,66 +21782,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahaísta" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "budista" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "cristiana" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hindú" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jainista" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "judía" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "musulmana" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sijista" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "espiritualista" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoista" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "unitarismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroástrica" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Confesión" @@ -21276,81 +21850,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglicano" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptista" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "católico" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangélico" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "testigos de Jehová" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "luterano" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "metodista" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormón" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "ortodoxo" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbiteriano" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestante" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "cuáquero" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "chiita" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "suní" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Direcciones" @@ -21359,5 +21933,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Editar direcciones" @@ -21365,5 +21939,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Número de portal" @@ -21371,20 +21945,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Nombre del edificio" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Nombre de la calle" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Nombre de la ciudad" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Código postal" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Código del país" @@ -21393,5 +21972,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Editar direcciones interpoladas" @@ -21399,61 +21978,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Esquema numérico" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "impares" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "pares" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "alfabético" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Construcciones" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Fábrica" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Editar fábrica" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Torre" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Editar torre" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "Tipo de torre" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "comunicación" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "observación" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "Altura (en metros)" @@ -21461,25 +22040,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Torre de agua" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Editar torre de agua" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gasómetro" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Editar gasómetro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Faro" @@ -21487,10 +22066,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Editar faro" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Molino de viento" @@ -21498,10 +22077,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Editar molino de viento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Tubería" @@ -21510,37 +22089,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Editar tubería" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "aceite" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "aguas residuales" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "térmico" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "cualquier substancia" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "sumergido" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "elevado" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Depuradora" @@ -21550,10 +22129,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Editar depuradora" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Grúa" @@ -21561,10 +22140,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Editar grúa" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Baliza" @@ -21572,10 +22151,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Editar baliza" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Vértice geodésico" @@ -21583,10 +22162,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Editar vértice geodésico" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Cámara de vigilacia" @@ -21594,5 +22173,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Editar cámara de vigilancia" @@ -21600,5 +22179,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Generador de energía" @@ -21608,35 +22187,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Editar generador de energía" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "eólico" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "hidráulico" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fósil" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "carbón" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "fotovoltaico" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Central eléctrica" @@ -21645,10 +22224,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Editar central eléctrica" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Subestación eléctrica" @@ -21657,5 +22236,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Editar subestación eléctrica" @@ -21663,10 +22242,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Línea de referencia" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Torre de electricidad" @@ -21677,23 +22256,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Editar torre de electricidad" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "torre" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "poste" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "Torre de referencia" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Tendido eléctrico" @@ -21702,75 +22281,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Editar tendido eléctrico" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "Tipo de línea" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "alta tensión" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "baja tensión" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Voltaje" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "Cantidad de cables" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "Número de alambres (mejor: conductores) por cable de tensión" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "sencillo" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "doble" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "triple" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "quad" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Servicios" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Baños" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Buzón de correos" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Teléfono" @@ -21779,5 +22358,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Editar teléfono" @@ -21785,5 +22364,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Monedas" @@ -21791,5 +22370,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Billetes" @@ -21797,5 +22376,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Tarjetas de recarga y monederos electrónicos" @@ -21803,5 +22382,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Tarjetas de débito" @@ -21809,15 +22388,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Tarjetas de crédito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Tarjetas telefónicas" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Reciclaje" @@ -21826,5 +22405,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Editar punto limpio" @@ -21832,68 +22411,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Baterías" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Envases" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Ropas" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Vidrio" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papel" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Chatarra" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Banco" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "Backrest" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "Material" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "piedra" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "plástico" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "Color" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "negro" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "marrón" @@ -21964,39 +22538,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "zona verde" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "red" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "azul" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "gris" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "blanco" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "Número de asientos" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Apostadero de caza" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Editar apostadero de caza" @@ -22005,30 +22579,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Altura" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "profundidad" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "media" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "total" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Oculto" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Esclusa" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fuente" @@ -22037,10 +22611,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Editar fuente" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Agua potable" @@ -22049,10 +22623,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Editar agua potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Caja tibia" @@ -22060,33 +22634,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Editar caja tibia" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Tiendas" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Editar concesionario de automóviles" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Editar tienda de bicicletas" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermercado" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Editar supermercado" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "Farmacia" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "Editar farmacia" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Tienda de alimentación" @@ -22094,9 +22692,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Editar tienda de alimentación" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosco" @@ -22104,27 +22702,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Editar kiosco" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "Librería" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "Editar librería" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Agencia de viajes" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Editar agencia de viajes" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Máquina expendedora" @@ -22132,5 +22730,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Editar máquina expendedora" @@ -22138,88 +22736,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Expendedor automático de productos" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "billetes de de transporte público" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "abonos de transporte público" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "billetes de aparcamiento" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "Alimentación" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "Bebidas" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "Caramelos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "Estanco" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "fotos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "comida para animales" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "Periódicos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "juguetes" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "sellos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "Tarjetas SIM" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "Tarjetas telefónicas" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "Bonos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "condones" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampones" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "Bolsas para excrementos" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Tarjetas de fidelización o descuento" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Carnicería" @@ -22227,9 +22825,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Editar carnicería" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Panadería" @@ -22237,9 +22835,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Editar panadería" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Floristería" @@ -22247,18 +22845,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Editar floristería" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Tienda de productos orgánicos" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Editar tienda de productos orgánicos" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Tienda de bebidas alcohólicas" @@ -22266,54 +22864,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Editar tienda de bebidas alcohólicas" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Bebidas" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Editar tienda de bebidas" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Tienda de informática" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Editar tienda de informática" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Electrónica" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Editar tienda de electrónica" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Editar Tienda Hifi" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Muebles" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Editar mueblería" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Centro de jardinería" @@ -22321,9 +22919,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Editar centro de jardinería" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Hardware" @@ -22331,9 +22929,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Editar almacén de hardware" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Almacén de bricolaje" @@ -22341,54 +22939,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Editar almacén de bricolaje" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Papelería" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Editar papelería" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Peluquería" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Editar peluquería" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Zapatos" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Editar zapatería" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Juguetes" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Editar juguetería" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Editar tienda de videos" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Tintorería" @@ -22396,9 +22994,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Editar tintorería" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Lavandería" @@ -22406,9 +23004,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Editar lavandería" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Tienda de actividades al aire libre" @@ -22416,28 +23014,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Editar tienda de actividades al aire libre" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Editar tienda de material de deportes" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Óptica" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Editar óptica" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Dinero en efectivo" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banco" @@ -22445,14 +23043,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Editar banco" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Cajero automático" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Cambio de moneda" @@ -22460,5 +23058,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Editar cambio de moneda" @@ -22466,15 +23064,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Editar cajero automático" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Centro médico" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Médico" @@ -22482,18 +23080,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Editar médico" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Dentista" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Editar dentista" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Farmacia/Parafarmacia" @@ -22501,5 +23099,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Editar farmacia/parafarmacia" @@ -22507,9 +23105,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Expende con receta médica" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Hospital" @@ -22517,10 +23115,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Editar hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Punto de acceso para emergencias" @@ -22529,5 +23127,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Editar punto de acceso para emergencias" @@ -22536,20 +23134,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Número de punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Nombre del Punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Número de teléfono" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Utilizar código internacional, como +12-345-67890)" @@ -22557,5 +23155,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Veterinario" @@ -22564,64 +23162,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Editar veterinario" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "Geografía" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Lugares" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Continente" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Editar continente" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "País" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Editar país" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Estado/Provincia" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Editar estado/provincia" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Región" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Editar región" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Municipio" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Editar municipio" @@ -22629,15 +23227,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Ciudad (>100.000 hab.)" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Editar ciudad (>100.00 hab.)" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Ciudad (10.000 - 100.000 hab.)" @@ -22645,10 +23243,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Editar ciudad (10.000 - 100.000 hab.)" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "" @@ -22658,5 +23256,5 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "" @@ -22665,15 +23263,15 @@ #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Población (< 10.000 hab.)" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Editar población (< 10.000 hab.)" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "" @@ -22681,5 +23279,5 @@ #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "" @@ -22689,5 +23287,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Paraje" @@ -22695,10 +23293,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Editar paraje" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Isla" @@ -22706,10 +23304,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Editar isla" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "Islote" @@ -22717,5 +23315,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "Editar islote" @@ -22723,5 +23321,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Entrada de cueva" @@ -22729,10 +23327,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Editar entrada de cueva" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Pico" @@ -22740,10 +23338,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Editar pico" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Glaciar" @@ -22751,10 +23349,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Editar glaciar" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Volcán" @@ -22762,70 +23360,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Editar volcán" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Fronteras" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Nacional" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Editar frontera nacional" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administrativa" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Editar frontera administrativa" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Civil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Editar frontera civil" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Político" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Editar frontera política" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Parque Nacional" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Editar límites del parque nacional" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Uso del suelo" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Árbol" @@ -22834,15 +23432,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Editar árbol" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Nombre botánico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Bosque" @@ -22851,5 +23449,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Editar bosque" @@ -22857,17 +23455,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "conífera" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "caducifolio" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "mixto" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Plantación forestal" @@ -22876,14 +23474,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Editar zona forestal" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Reserva natural" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Editar reserva natural" @@ -22891,25 +23489,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Pedregal" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Editar pedregal" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Matorral" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Editar matorral" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Braña" @@ -22917,10 +23515,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Editar braña" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Brezal o landa" @@ -22928,5 +23526,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Editar brezal o landa" @@ -22934,5 +23532,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Edificio agrario" @@ -22941,45 +23539,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Editar edificio agrario" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Tierra de labranza" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Editar tierra de labranza" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Prado" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Editar prado" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Viñedo" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Editar viñedo" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Huertos de ocio" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Editar zona de huertos de ocio" @@ -22987,25 +23585,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Jardín" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Editar jardín" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Pastizal" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Editar pastizal" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Parque municipal" @@ -23013,10 +23611,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Editar parque municipal" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)" @@ -23024,20 +23622,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Editar espacio de uso común" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Parque" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Editar parque" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Área de esparcimiento" @@ -23045,5 +23643,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Editar área de esparcimiento" @@ -23051,15 +23649,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Área residencial" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Editar suelo residencial" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Camposanto (para los cementerios próximos a las iglesias)" @@ -23067,9 +23665,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Editar camposanto" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Cementerio" @@ -23077,39 +23675,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Editar cementerio" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Comercios" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Editar comercios" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Oficinas" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Editar oficinas" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Industrial" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Editar suelo industrial" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Zona ferroviaria" @@ -23117,15 +23715,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Editar zona ferroviaria" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militar" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Editar área militar" @@ -23133,55 +23731,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Zona en construcción" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Editar zona en construcción" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Baldío" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Editar terreno baldío" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Suelo en construcción" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Editar suelo en contrucción" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Vertedero" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Editar vertedero" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Cantera" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Editar cantera" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multipolígono" @@ -23191,5 +23789,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Editar multipolígono" @@ -23198,10 +23796,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "segmento exterior" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "segmento interior" @@ -23209,5 +23807,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Restricción de giro" @@ -23216,5 +23814,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Editar restricción de giro" @@ -23222,51 +23820,51 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Restricción" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "prohibido girar a la izquierda" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "prohibido girar a la derecha" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "prohibido continuar recto" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "prohibido giro en U" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "solo giro a la derecha" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "solo giro a la izquierda" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" -msgstr "solo recto" +msgstr "solo ir recto" #. item "Relations/Turn restriction" text "Name" #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "desde la vía" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "a través de nodo o vía" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "a la vía" @@ -23274,5 +23872,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Ruta" @@ -23281,5 +23879,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Editar ruta" @@ -23287,5 +23885,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Tipo de ruta" @@ -23357,24 +23955,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "bicicleta" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "carretera" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "ski" @@ -23427,5 +24025,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23434,13 +24032,13 @@ msgstr "pie" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "senderismo" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "tranvía" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "desvío" @@ -23454,10 +24052,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Descripción del símbolo" @@ -23465,31 +24063,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Red" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "Ruta estatal" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "Propuesto" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "Suplente" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "temporal" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "Conexión" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Color (hex)" @@ -23498,30 +24096,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "segmento de la ruta" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "segmento siguiente" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "segmento anterior" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "punto de detención" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "próximo punto de parada" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "anterior punto de parada" @@ -23732,130 +24330,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23872,98 +24344,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "obsoleto" @@ -24340,7 +24721,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "pista" @@ -24404,13 +24785,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "ferrocarril" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24426,5 +24886,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "servicios" @@ -24438,5 +24898,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "vado" @@ -24457,5 +24917,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "círculo de giro" @@ -24470,5 +24930,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "Punto de acceso de emergencias" @@ -24483,5 +24943,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "ribera" @@ -24495,5 +24955,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "arroyo" @@ -24507,5 +24967,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "muelle" @@ -24527,16 +24987,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "acueducto" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24633,4 +25081,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24699,13 +25154,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "hecho por el hombre" @@ -24751,6 +25206,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24767,7 +25222,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "punto ferroviario" @@ -24790,10 +25245,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "otros ferrocarriles" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "paso con más de un cruce ferroviario" @@ -24829,11 +25284,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "vía muerta" #. color rail +#. #. 1 #. 50000 @@ -24874,6 +25330,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "aerovía" @@ -24887,5 +25343,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -24907,5 +25363,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "pista (oscuro)" @@ -24919,5 +25375,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "pista (claro)" @@ -24925,4 +25381,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24972,7 +25435,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "pista de rodadura" @@ -24989,5 +25452,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "pista fácil" @@ -25002,5 +25465,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "pista intermedia" @@ -25015,5 +25478,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "pista avanzada" @@ -25028,5 +25491,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "pista para expertos" @@ -25041,5 +25504,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "pista de estilo libre" @@ -25054,5 +25517,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "pista para iniciados" @@ -25172,11 +25635,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "energía" @@ -25190,5 +25653,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "muelle" @@ -25202,5 +25665,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "tubería" @@ -25328,12 +25791,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "ocio" @@ -25347,5 +25827,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "puerto deportivo" @@ -25383,4 +25863,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25399,4 +25895,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25417,8 +25921,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "servicios" @@ -25520,10 +26026,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "tráfico de ocio" @@ -25777,5 +26283,5 @@ #. #. -#. +#. #. color health #. @@ -25921,4 +26427,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25938,23 +26452,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "equipamiento lumínico" @@ -25986,6 +26500,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "agua (claro)" @@ -26046,14 +26560,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "salud" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26400,5 +26914,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26421,5 +26934,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "tienda" @@ -26491,8 +27005,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotel" @@ -26593,9 +27107,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turismo" @@ -26683,9 +27197,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "patrimonio histórico" @@ -26699,5 +27213,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "cantera" @@ -26711,5 +27225,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "vertedero" @@ -26731,5 +27245,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "cuenca" @@ -26743,5 +27257,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "plantación forestal" @@ -26755,5 +27269,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "edificio agrario" @@ -26776,5 +27290,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "venta al por menor" @@ -26788,5 +27302,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "industrial" @@ -26800,5 +27314,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "área postindustrial degradada" @@ -26812,5 +27326,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "área rururbana" @@ -26824,5 +27338,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "zona ferroviaria" @@ -26879,7 +27393,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "zona militar" @@ -26893,5 +27407,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "cementerio" @@ -26904,5 +27418,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "pico" @@ -26917,5 +27431,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "glaciar" @@ -26929,5 +27443,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "volcán" @@ -26982,8 +27496,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "espacio natural" @@ -26997,5 +27511,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "matorral" @@ -27009,5 +27523,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "monte" @@ -27021,5 +27535,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "área forestal" @@ -27033,5 +27547,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "lodazal" @@ -27045,5 +27559,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "playa" @@ -27121,8 +27635,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "ruta" @@ -27170,7 +27684,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "frontera" @@ -27320,11 +27834,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "lugar" @@ -27372,6 +27886,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "dirección" @@ -27727,25 +28241,128 @@ msgstr "" +#~ msgid "Updating primitive" +#~ msgstr "Oinarrizkoa eguneratzen" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Se esperaba un cierre de paréntesis." + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está " -#~ "presente" +#~ "El número de modificaciones actuales supera el máximo de modificaciones, " +#~ "el actual es {0}, el máximo es {1}" + +#~ msgid "Use an open changeset" +#~ msgstr "Usar un nuevo conjunto de cambios" #~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Permitir subir todos los cambios en una petición, no permitir usar una " -#~ "petición por cambio sencillo" - -#~ msgid "Images for {0}" -#~ msgstr "Imágenes para {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Leer gpx" - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "No hay hora para el punto {0} x {1}" +#~ "No puedo tomar una imagen de mi receptor GPS
¿Puede ayudarme?" + +#~ msgid "All images" +#~ msgstr "Todas las imágenes" + +#~ msgid "Images with no exif position" +#~ msgstr "Imágenes sin la posición exif" + +#~ msgid "Not yet tagged images" +#~ msgstr "Fotos no etiquetadas todavía" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Encontrado {0} coincidencias de{1} en la traza GPX {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "Traza GPX cargada" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Diferencia temporal entre la traza y las fotografías: {0}m {1}s" + +#~ msgid "Default Values" +#~ msgstr "Valores por defecto" + +#~ msgid "Enable proxy server" +#~ msgstr "Habilitar servidor proxy" + +#~ msgid "Anonymous" +#~ msgstr "Anónimo" + +#~ msgid "Proxy server host" +#~ msgstr "Servidor proxy del host" + +#~ msgid "Proxy server port" +#~ msgstr "Puerto del servidor proxy" + +#~ msgid "Proxy server username" +#~ msgstr "Usuario del servidor proxy" + +#~ msgid "Proxy server password" +#~ msgstr "Contraseña del servidor proxy" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, Posiblemente faltan algunas etiquetas." + +#~ msgid "Preparing data..." +#~ msgstr "Preparando datos..." + +#~ msgid "Preparing..." +#~ msgstr "Preparando…" + +#~ msgid "Uploading..." +#~ msgstr "Subiendo..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Contraseña o nombre de usuario incorrectos" + +#~ msgid "Enter Password" +#~ msgstr "Introduzca contraseña" + +#~ msgid "Login" +#~ msgstr "Inicio de sesión" + +#~ msgid "Error: failed to add authentication credentials to the connection." +#~ msgstr "" +#~ "Error: fallo al añadir credenciales de autentificación a la conexión." + +#~ msgid "Auto-tag source added:" +#~ msgstr "Etiquetado automático de la fuente añadida:" + +#~ msgid "Interpolation" +#~ msgstr "Interpolación" + +#~ msgid "Optional" +#~ msgstr "Opcional" + +#~ msgid "Shop" +#~ msgstr "Concesionario" + +#~ msgid "aqueduct" +#~ msgstr "acueducto" + +#~ msgid "Move" +#~ msgstr "Mover" + +#~ msgid "No data imported." +#~ msgstr "No se importó ningún dato." + +#~ msgid "Unknown file extension." +#~ msgstr "Extensión de archivo desconocida." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Ningún documento abierto luego nada por grabar." + +#~ msgid "Email" +#~ msgstr "Correo Electrónico" + +#~ msgid "Merging conflicts." +#~ msgstr "Combinar conflictos" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Resolver conflictos" + +#~ msgid "There were conflicts during import." +#~ msgstr "Existieron conflictos durante la importación" #~ msgid "Cannot read time \"{0}\" from point {1} x {2}" @@ -27763,6 +28380,57 @@ #~ msgstr "Finalizar GPS: {0}" -#~ msgid "current delta: {0}s" -#~ msgstr "delta actual: {0}s" +#~ msgid "No time for point {0} x {1}" +#~ msgstr "No hay hora para el punto {0} x {1}" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "La hora no pudo ser analizada sintácticamente." + +#~ msgid "Image" +#~ msgstr "Imagen" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)" + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"." + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "No se puede abrir el directorio de preferencias: {0}" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contactando con el servidor OSM..." + +#~ msgid "Error while parsing" +#~ msgstr "Error mientras se analizaba sintácticamente" + +#~ msgid "their version:" +#~ msgstr "su versión:" + +#~ msgid "resolved version:" +#~ msgstr "versión resuelta:" + +#~ msgid "my version:" +#~ msgstr "mi versión:" + +#~ msgid "Object" +#~ msgstr "Objeto" + +#~ msgid "Unknown version" +#~ msgstr "Versión desconocida" + +#~ msgid "position" +#~ msgstr "posición" + +#~ msgid "different" +#~ msgstr "diferente" + +#~ msgid "false" +#~ msgstr "falso" + +#~ msgid "true" +#~ msgstr "verdadero" + +#~ msgid "unnamed" +#~ msgstr "sin nombre" #~ msgid "timezone difference: " @@ -27779,114 +28447,4 @@ #~ "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente." -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"." - -#~ msgid "Image" -#~ msgstr "Imagen" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Zona horaria del GPS (diferencia con la foto)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Sincronizar hora con la del receptor GPS" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "La hora no pudo ser analizada sintácticamente." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Fotos geoetiquetadas" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "abrir imágenes con AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "Opciones de osmarender" - -#~ msgid "Group common Address Interpolation inputs in a single dialog," -#~ msgstr "" -#~ "Agrupar las entradas comunes de \tinterpolación de direcciones en un " -#~ "único diálogo," - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "Otro complemento de geoetiquetado para JOSM. Se relaciona las fotografías " -#~ "con la traza del GPS o importa los metadatos geográficos EXIF de las " -#~ "fotos." - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Varias utilidades que hacen la vida en JOSM mucho más fácil: por ejemplo, " -#~ "simplificar un vía, unir áreas, moverse a un determinada posición, etc." - -#~ msgid "Move" -#~ msgstr "Mover" - -#~ msgid "No data imported." -#~ msgstr "No se importó ningún dato." - -#~ msgid "Unknown file extension." -#~ msgstr "Extensión de archivo desconocida." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Ningún documento abierto luego nada por grabar." - -#~ msgid "Email" -#~ msgstr "Correo Electrónico" - -#~ msgid "Merging conflicts." -#~ msgstr "Combinar conflictos" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolver conflictos" - -#~ msgid "There were conflicts during import." -#~ msgstr "Existieron conflictos durante la importación" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "No se puede abrir el directorio de preferencias: {0}" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Contactando con el servidor OSM..." - -#~ msgid "Error while parsing" -#~ msgstr "Error mientras se analizaba sintácticamente" - -#~ msgid "their version:" -#~ msgstr "su versión:" - -#~ msgid "resolved version:" -#~ msgstr "versión resuelta:" - -#~ msgid "my version:" -#~ msgstr "mi versión:" - -#~ msgid "Object" -#~ msgstr "Objeto" - -#~ msgid "Unknown version" -#~ msgstr "Versión desconocida" - -#~ msgid "position" -#~ msgstr "posición" - -#~ msgid "different" -#~ msgstr "diferente" - -#~ msgid "false" -#~ msgstr "falso" - -#~ msgid "true" -#~ msgstr "verdadero" - -#~ msgid "unnamed" -#~ msgstr "sin nombre" - #~ msgid "Unsaved Changes" #~ msgstr "Cambios no guardados" @@ -27904,4 +28462,7 @@ #~ msgid "OSM username (email)" #~ msgstr "Nombre de usuario OSM (correo electrónico)" + +#~ msgid "current delta: {0}s" +#~ msgstr "delta actual: {0}s" #~ msgid "Please select at least one task to download" @@ -28042,4 +28603,13 @@ #~ msgstr "nombre" +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Zona horaria del GPS (diferencia con la foto)" + +#~ msgid "Images for {0}" +#~ msgstr "Imágenes para {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Leer gpx" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Añadir site-josm.xml o bien Páginas Wiki" @@ -28100,4 +28670,7 @@ #~ msgstr "Añadir nueva fuente de etiquetas preestablecidas a la lista." +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Fotos geoetiquetadas" + #~ msgid "Server does not support changesets" #~ msgstr "El servidor no soporta conjuntos de cambios" @@ -28145,4 +28718,10 @@ #~ msgid "Please select the row to copy." #~ msgstr "Por favor, seleccione una fila para copiar" + +#~ msgid "osmarender options" +#~ msgstr "Opciones de osmarender" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "abrir imágenes con AgPifoJ..." #~ msgid "Request Update" @@ -28311,4 +28890,7 @@ #~ "Deshaga su última acción, guarde su trabajo\n" #~ "y cree una nueva capa en otra zona." + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Sincronizar hora con la del receptor GPS" #~ msgid "Public" @@ -28508,4 +29090,12 @@ #~ msgstr "Carga directamente archivos TCX en JOSM" +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Otro complemento de geoetiquetado para JOSM. Se relaciona las fotografías " +#~ "con la traza del GPS o importa los metadatos geográficos EXIF de las " +#~ "fotos." + #~ msgid "Lambert Zone 3 cache file (.3)" #~ msgstr "Archivo caché de la zona Lambert 3 (.3)" @@ -28704,7 +29294,4 @@ #~ msgstr "Seleccione un nodo de inicio en el extremo de la vía" -#~ msgid "Reached a junction" -#~ msgstr "Alcanzar una intersección" - #~ msgid "WGS84 Geographisch" #~ msgstr "WGS84 Geográfico" @@ -28750,6 +29337,10 @@ #~ msgstr "Vinculado" -#~ msgid "File could not be found." -#~ msgstr "El archivo no se encuentra." +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Permitir subir todos los cambios en una petición, no permitir usar una " +#~ "petición por cambio sencillo" #~ msgid "" @@ -28806,4 +29397,10 @@ #~ "\"{1}\">su idioma." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está " +#~ "presente" + #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "" @@ -28862,4 +29459,9 @@ #~ "
¿Eliminar de la relación?" +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "" +#~ "Agrupar las entradas comunes de \tinterpolación de direcciones en un " +#~ "único diálogo," + #~ msgid "Processing {0}" #~ msgstr "Procesando {0}" @@ -28888,2 +29490,9 @@ #~ "La fuente XML (URL o ruta del archivo) para los archivos de definición " #~ "{0}." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Varias utilidades que hacen la vida en JOSM mucho más fácil: por ejemplo, " +#~ "simplificar un vía, unir áreas, moverse a un determinada posición, etc." Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 19198) +++ /applications/editors/josm/i18n/po/et.po (revision 19199) @@ -4,11 +4,12 @@ # FIRST AUTHOR , 2008. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-12-05 21:18+0000\n" -"Last-Translator: lyyser \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-18 18:46+0000\n" +"Last-Translator: Margus Värton \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Loon kasutajaliidest" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Abi" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoreerin vigast URL''i: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Hoiatus" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoreerin vigast faili URL''i: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -264,5 +266,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:269 msgid "Plugins" -msgstr "Lisand programmid" +msgstr "Pistikrakendused" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87 @@ -270,5 +272,5 @@ msgstr "JOSM -i kohta ..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -277,5 +279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -284,5 +286,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -290,16 +292,23 @@ "screen with browser windows
and take some time to finish." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +"Te olete käivitamas {0} brauseriakent.
See võib tekitada ekraanil " +"segadust brauseriakendega
ning võtta mõnevõrra aega." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Jätka" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -308,29 +317,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -347,5 +357,10 @@ msgstr "Katkesta" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Vajuta, katkestamaks sõlmede liitmist" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Palun vali vähemalt üks juba üles laetud sõl, tee või relatsioon." @@ -361,7 +376,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" -msgstr "Ühenda" +msgstr "Liida" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 @@ -377,15 +392,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Lisa märkus..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Lisa sõlm laiuskraadi ja pikkuskraadi järgi." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -401,22 +416,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Toimeta {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Lisa koordinaadid uuele sõlmele." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Kasuta kraade kümnendsüsteemis." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatiivsed väärtused märgivad lääne/lõunapoolkera." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -425,5 +440,5 @@ msgstr "Laiuskraad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -432,28 +447,29 @@ msgstr "Pikkuskraad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +msgstr "Palun sisesta sobiv laiuskraad vahemikus -90..90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +msgstr "Palun sisesta laiuskraad vahemikus -90..90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +msgstr "Palun sisesta sobiv pikkuskraad vahemikus -180..180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +msgstr "Palun sisesta pikkuskraad vahemikus -180..180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -465,11 +481,11 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +msgstr "Sulge dialoog ja loo uus sõlm" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "Sule dialoog, ära loo uut sõlme" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -488,18 +504,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -511,5 +527,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -531,6 +547,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -577,5 +593,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" @@ -612,14 +628,15 @@ msgstr "Ei ole vastuolusid, millele suumida" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Sule avatud muutustekogumid" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +msgstr "Suleb avatud muutustekogumid" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -629,21 +646,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Fail: {0}" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "Avatud muutustekogumeid ei ole" + #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -msgid "There are no open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +msgstr "Avatud muutustekogumid puuduvad" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Laen avatud muutustekogumeid alla ..." @@ -721,4 +738,6 @@ "three nodes." msgstr "" +"Palun vali täpselt kaks või kolm sõlme või üks täpselt kahe või kolme " +"sõlmega tee." #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18 @@ -726,11 +745,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -782,9 +802,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 msgid "Download parent ways/relations..." -msgstr "" +msgstr "Lae alla vanemaiks olevad teed ja relatsioonid..." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40 msgid "Download primitives referring to one of the selected primitives" -msgstr "" +msgstr "Lae alla primitiivid, mis viitavad ühele valitud primitiividest" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87 @@ -792,5 +812,5 @@ #, java-format msgid "Id > 0 required, got {0}" -msgstr "" +msgstr "Nõutud on Id, mis on suurem kui null, sain {0}" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89 @@ -808,19 +828,24 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "" +msgstr "Parameeter ''{0}'' ei tohi olla tühi" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 @@ -839,19 +864,19 @@ #, java-format msgid "({0}/{1}) Loading parents of node {2}" -msgstr "" +msgstr "({0}/{1}) Sõlme {2} vanemate laadimine" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257 #, java-format msgid "({0}/{1}) Loading parents of way {2}" -msgstr "" +msgstr "({0}/{1}) Tee {2} vanemate laadimine" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:258 #, java-format msgid "({0}/{1}) Loading parents of relation {2}" -msgstr "" +msgstr "({0}/{1}) Relatsiooni {2} vanemate laadimine" #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Kahekordista" @@ -881,5 +906,5 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Täisekraanvaade" #. no icon @@ -890,14 +915,14 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 msgid "Toggle Fullscreen view" -msgstr "" +msgstr "Lülita täisekraanvaade" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Ekspordi GPX-i..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Ekspordi andmed GPX faili." @@ -912,12 +937,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -942,8 +967,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -954,10 +979,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -970,17 +995,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1017,22 +1042,27 @@ msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide objektide kohta." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Kattuvate alade ühendamine" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Ühendab üksteist katvad alad" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Palun vali ühendamiseks vähemalt üks suletud tee." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Praegu saab ühendada ainult kuni kaks ala." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +msgstr "\"{0}\" ei ole suletud ning seega ei saa seda ühendada." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1041,75 +1071,76 @@ "Are you really sure to continue?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +"Valitud tee(de)l on sõlmi väljaspool alla laetud andmete ala.\n" +"See võib põhjustada sõlmede tahtmatud kustutamist.\n" +"Kas oled tõesti kindel, et soovid jätkata?" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgstr "Kui Sa pole kindel, palun katkesta tegevus" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgstr "Lõikumist ei leitud. Mitte midagi ei muudetud." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgstr "Sõlm lisatud kõikidesse lõikumiskohtadesse." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgstr "Kustutada teed, mis pole sisemise multihulknurga osad" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgstr "Paranda relatsioonid" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgstr "Ühendatud iseenesega kattuv ala" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +msgstr "Kattuvate alade ühendamine" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " "verify no errors have been introduced." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +"Mõned teed oli osaks muudetud relatsioonist. Palun kontrolli, et sellega ei " +"tekitatud vigu." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Sisesta kõigi vastuolude kohta väärtused." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Lahenda vastuolud." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgstr "Paranda sildikonfliktid" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgstr "Element relatsioonidest eemaldatud" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgstr "Alade ühendamine: Eemalda lühikesed teed" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgstr "Suletud tee" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgstr "Eemalda sildid sisemistelt teedelt" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" -msgstr "" +msgstr "Alade ühendamise funktsioon" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 @@ -1132,42 +1163,44 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 msgid "Jump To Position" -msgstr "" +msgstr "Hüppa asukohta" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 msgid "Opens a dialog that allows to jump to a specific location" -msgstr "" +msgstr "Avab dialoogi, mis võimaldab hüpata määratud asukohta" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 msgid "Enter Lat/Lon to jump to position." -msgstr "" +msgstr "Sisesta asukohta hüppamiseks koordinaadid." #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "" +msgstr "Saad siia kleepida ka viite aadressilt www.openstreetmap.org" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 msgid "Zoom (in metres)" -msgstr "" +msgstr "Suurendusaste (meetrites)" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "URL" -msgstr "" +msgstr "Viide" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 msgid "Jump there" -msgstr "" +msgstr "Hüpe sinna" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 msgid "Jump to Position" -msgstr "" +msgstr "Hüpe asukohta" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" +"Ei suutnud eraldada laiuskraadi, pikkuskraadi või suurendusastet. Palun " +"kontrolli." #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 msgid "Unable to parse Lon/Lat" -msgstr "" +msgstr "Ei suuda eraldada pikkus/laiuskoordinaate." #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 @@ -1177,5 +1210,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge the current layer into another layer" -msgstr "" +msgstr "Liida jooksev kiht teise kihiga" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46 @@ -1194,9 +1227,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 msgid "Abort Merging" -msgstr "" +msgstr "Katkesta liitmine" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128 msgid "Click to abort merging nodes" -msgstr "" +msgstr "Vajuta, katkestamaks sõlmede liitmist" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 @@ -1205,18 +1238,19 @@ "Cannot merge nodes: Would have to delete way ''{0}'' which is still used." msgstr "" +"Sõlmi ei saa liita - selleks peaks kustutama kasutusel oleva tee ''{0}''." #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" -msgstr "Sulanda {0} sõlm(e)" +msgstr "Liida {0} sõlm(e)" #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 msgid "Merge selection" -msgstr "Ühenda valik" +msgstr "Liida valik" #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 msgid "Merge the currently selected primitives into another layer" -msgstr "Ühenda valitud primitiivid teise kihti" +msgstr "Liida valitud primitiivid teise kihti" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 @@ -1270,5 +1304,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Objekte ei saa maailmast välja viia" @@ -1301,5 +1335,5 @@ #, java-format msgid "Opening file ''{0}'' ..." -msgstr "" +msgstr "Avan faili ''{0}'' ..." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39 @@ -1348,28 +1382,28 @@ msgstr "Andmete allalaadimine" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Muuda kujund ortogonaalseks." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Liiguta kõik sõlmed 90 või 270 kraadise nurga alla." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1378,9 +1412,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1389,16 +1423,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Ristkülikusta." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Kasutus" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Ristkülikusta." #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1471,18 +1505,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Pööra tee suund." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Pööra kõigi valitud teede suund." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Palun vali vähemalt üks tee." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Pööra teede suund." @@ -1491,10 +1525,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Salvesta" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Salvesta praegused andmed" @@ -1551,10 +1585,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Salvesta nimega..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Salvesta need andmed uude faili." @@ -1596,6 +1630,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1629,5 +1662,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1692,5 +1725,5 @@ "middle of the way.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1698,5 +1731,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1704,5 +1737,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1736,34 +1769,34 @@ msgstr "See on üksik sõlm." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Ükski neist sõlmedest ei ole millegi küljes." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Ükski selle tee sõlmedest ei ole millegi muu küljes." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Praegust valikut ei saa liimist lahtivõtmiseks kasutada." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Vali miski:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* üks sildiga sõlm või" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* üks sõlm, mis on kasutusel rohkem kui ühes tees või" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1772,5 +1805,5 @@ "teedest" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1779,5 +1812,5 @@ "ühes neist teedest" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1790,9 +1823,9 @@ "Muul juhul saavad kõik teed omad koopiad ja kõik sõlmed valitakse." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Lahtisulatatud sõlm" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1800,5 +1833,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1833,10 +1866,10 @@ msgstr "Tühista kõik valikud (page)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Värskenda andmed" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1844,53 +1877,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "Andmete allalaadimine" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "Uuenda valik" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Uuenda valik" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Tühi valik" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "Uuenda objektid" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Lae andmed üles" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1899,5 +1928,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1905,131 +1934,7 @@ msgstr "Pole muudatusi mida üles laadida." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Midagi pole üles laadida. Hangi esmalt andmeid." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Sünkroniseeri kogu andmekogu" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Primitiivi uuendamine" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2164,9 +2069,9 @@ msgstr "Alla laetud GPX andmed" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Laen andmeid alla" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2174,5 +2079,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2243,7 +2148,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2258,58 +2163,52 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Joonistamine" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Sõlmede joonistamine" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "valitud" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Sõlme ei saa lisada maailmast väljapoole." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Lisa punkt" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Lisa teele sõlm" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Ühenda olemasolev tee sõlmega" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Ühenda uus sõlm olemasoleva teega" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Lisa sõlm teele ja ühenda" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Loo uus sõlm." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Vali kursori all olev sõlm." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2318,14 +2217,14 @@ msgstr[1] "Lisa {0} teele uus sõlm." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Alusta uut teed viimasest sõlmest." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Jätke teed viimasest sõlmest." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Lõpeta joonistamine." @@ -2365,18 +2264,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Vali" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2385,17 +2285,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2405,22 +2305,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Pööramise lõpetamiseks vabasta hiire nupp." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2430,5 +2330,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Mastaap" @@ -2450,5 +2350,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Otsi objekte." @@ -2544,8 +2444,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2553,45 +2461,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2599,55 +2513,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Otsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Alusta otsingut" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Leitud {0} vastet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2657,40 +2571,42 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "Võtme väärtus ei saa olla tühi. Näide: võti=väärtus" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" +msgstr "Puuduv primitiiv" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" +msgstr "Puuduv primitiiv" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +msgid "Missing operator for NOT" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2699,9 +2615,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2710,7 +2626,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2744,37 +2665,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "Muutuste arv ületab maksimaalse. Muutusi {0}, maksimaalselt {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Eeltingimuste rikkumine" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "{0} sõlme tees {1} ületab suurima lubatud sõlmede arvu {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "API võimaluste rikkumine" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Eeltingimuste rikkumine" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "{0} sõlme tees {1} ületab suurima lubatud sõlmede arvu {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2886,5 +2799,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2899,5 +2812,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -2995,4 +2908,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3104,5 +3032,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3184,15 +3112,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3201,5 +3129,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3208,5 +3136,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3215,5 +3143,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3222,5 +3150,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3228,5 +3156,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3235,5 +3163,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3242,5 +3170,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3249,5 +3177,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3256,10 +3184,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3267,24 +3195,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3293,5 +3221,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3320,5 +3248,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3340,31 +3268,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3372,5 +3293,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3381,27 +3302,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3409,5 +3330,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3419,5 +3340,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3425,25 +3346,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3451,43 +3372,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Parameeter ''{0}'' ei tohi olla tühi" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3495,5 +3428,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3521,10 +3454,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3532,7 +3461,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3547,5 +3476,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3563,146 +3492,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "valitud" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3711,6 +3632,6 @@ msgstr[1] "punktid" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3719,7 +3640,8 @@ msgstr[1] "teed" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3728,20 +3650,36 @@ msgstr[1] "seosed" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "taust" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" +msgstr "" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" msgstr "" @@ -3884,5 +3822,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "" @@ -3898,7 +3836,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3914,4 +3852,10 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3943,6 +3887,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Vastuolu" @@ -3956,7 +3900,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4041,74 +3985,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Kasutajanimi" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Salasõna" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4117,9 +4061,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4127,36 +4071,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktiveerin uuendatud pistikrakendused" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +msgstr "Varaste pistikrakendustel laadimine" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Pistikrakenduste laadimine" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Fail" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4171,22 +4115,22 @@ msgstr "Muuda" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Tööriistad" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Eelseaded" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4194,5 +4138,5 @@ msgstr "Menüü: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Heli" @@ -4271,13 +4215,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "kiht ei ole nimekirjas" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4310,5 +4255,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4316,6 +4261,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4324,5 +4269,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4331,5 +4276,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4338,25 +4283,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4364,9 +4309,9 @@ msgstr "Roll" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4398,11 +4343,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4411,6 +4356,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4418,6 +4363,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4425,40 +4370,40 @@ msgstr "Liikmed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4466,21 +4411,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4512,22 +4457,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4535,5 +4480,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4541,30 +4486,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4572,5 +4517,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4578,14 +4523,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4593,5 +4538,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4599,23 +4544,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4626,27 +4571,27 @@ msgstr "Eemalda" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4655,5 +4600,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4662,5 +4607,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4669,5 +4614,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4676,5 +4621,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4683,5 +4628,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4691,5 +4636,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4924,10 +4869,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4937,10 +4882,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5025,9 +4970,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5035,6 +4980,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "kõik" @@ -5123,7 +5068,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5133,6 +5078,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5240,4 +5185,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Kustuta valitud objektid." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Muuta väärtusi?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Lae alla" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Lae kaardi andmed OSM serverist" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Suleb avatud muutustekogumid" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Ava toimetajas valitud seos" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5251,12 +5248,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5274,18 +5271,18 @@ msgstr "Käsujada: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Lahenda" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5294,25 +5291,25 @@ "Pane valitud elemendid kaardil ülal asuvasse valitud objektide nimekirja." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5324,26 +5321,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5354,41 +5351,41 @@ msgstr "Lisa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5427,5 +5424,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5440,34 +5437,34 @@ msgstr "Ava kõikide laetud kihtide nimekiri." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Kustuta valitud kiht" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Näita/Peida" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Muuda valitud kihi nähtavust." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Liiguta valitud kiht ühe rea võrra üles." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Liiguta valitud kiht ühe rea võrra alla." @@ -5477,5 +5474,176 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Seosed" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Ava kõikide seoste nimekiri" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Seosed: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Ava toimetajas valitud seos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Kustuta valitud seos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Loo uus seos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Praegune valik" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Ava valiku nimekirja aken." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Suurenda valitud elementidele" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Suurenda valikule" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Valik: Relatsioonid:{0} / Teed:{1} / Punktid:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Valik" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Valik: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Lase paneel vabaks" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Autorid" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Ava valitud objektiga töötavate inimeste nimekiri." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Objekti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, java-format +msgid "{0} [incomplete]" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "suletud tee" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Laen avatud muutustekogumeid alla ..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5484,22 +5652,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Muuta väärtusi?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5508,5 +5676,5 @@ msgstr[1] "Muuda kuni {0} objekti seadeid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5515,227 +5683,71 @@ msgstr[1] "See muudab kuni {0} objekti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Palun vali võti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Palun vali väärtus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Palun vali objektid mille seadeid soovid muuta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Seaded/Liikmelisus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Valitud objektide seaded" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "On liikmeks järgnevas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Lisa seaded" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Seaded: {0} / Liikmelisus: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Seaded / Liikmelisus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Muuda seost" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Tõesti soovid kustutada valikut seosest {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Kustuta valitud võti kõkides objektides" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Kustuda seadeid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Muuda kõikide valitud objektide võtme väärtust" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Seosed" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Ava kõikide seoste nimekiri" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Seosed: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Ava toimetajas valitud seos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Kustuta valitud seos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Loo uus seos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Praegune valik" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Ava valiku nimekirja aken." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Suurenda valitud elementidele" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Suurenda valikule" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Valik: Suhted:{0} / Teed:{1} / Punktid:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Valik" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Valik: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Lase paneel vabaks" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Autorid" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Ava valitud objektiga töötavate inimeste nimekiri." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Autor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Objekti" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5797,14 +5809,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Lae alla kõik sellest seosest puudu olevad teed ja puntid" -msgstr[1] "Lae alla kõik sellest seosest puudu olevad teed ja puntid" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Allalaadimise asukoht" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5831,9 +5842,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Ava toimetajas valitud seos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5842,14 +5852,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5859,9 +5869,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5871,15 +5881,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5887,5 +5897,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5893,20 +5903,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5915,70 +5925,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Sport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5987,9 +5996,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -5998,48 +6007,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "Rakenda jooksvad uuendused" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Lae alla liikmed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6049,34 +6057,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6188,10 +6196,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6201,5 +6209,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6284,9 +6292,4 @@ msgid "Download Area" msgstr "Allalaetav ala" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Lae alla" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6585,6 +6588,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6597,6 +6598,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6867,4 +6866,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7087,5 +7090,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7128,116 +7131,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Nimi" @@ -7261,15 +7264,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7440,10 +7443,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7451,5 +7454,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7457,9 +7460,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7574,6 +7577,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "tundmatu" @@ -7595,13 +7598,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7636,4 +7639,116 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Sünkroniseeri kogu andmekogu" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7652,39 +7767,147 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Lae andmed juba avatud muutustekogumisse" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Lae andmed juba avatud muutustekogumisse" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Lae andmed juba avatud muutustekogumisse" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Salvesta kasutaja ja salasõna (krüpteerimata)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +msgid "Please enter the user name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Ettevaatust: Salasõna saadetakse krüpteerimata." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Kergejõustik" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Muuda seost" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7751,17 +7974,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7774,9 +7997,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7790,9 +8013,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7807,50 +8030,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Tühista ja välju" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7858,5 +8081,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7929,40 +8152,376 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Uuenda objektid" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "suusanõlv edasijõudnutele" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Saadaolevate pistikrakenduste konfigureerimine." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Kasuta eelseadet \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Lae muudatused üles" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Teave" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Vajuta, katkestamaks sõlmede liitmist" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Palun vali rida kustutamiseks" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Objektid lisada:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Objektid muuta:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Objektid kustutada:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7971,5 +8530,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -7978,5 +8537,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -7985,209 +8544,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Lae muudatused üles" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Palun sisesta enne soovitud kordinaadid." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Lae andmed juba avatud muutustekogumisse" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Lae andmed juba avatud muutustekogumisse" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Palun sisesta otsingutekst" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8195,5 +8582,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8202,5 +8589,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8282,5 +8669,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "" @@ -8312,10 +8699,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Muuda andme kihiks" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8325,12 +8712,12 @@ "kahjulikuks.
Kui soovite üles laadida radasid, vaata siia:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8339,29 +8726,29 @@ msgstr "Muudetud sellest: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8370,9 +8757,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8380,5 +8767,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8386,23 +8773,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Andmekiht {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8411,5 +8798,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8423,5 +8810,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8434,11 +8821,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8447,36 +8834,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8484,5 +8871,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8491,5 +8878,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8497,5 +8884,5 @@ msgstr[1] "punktid" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8504,5 +8891,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8511,5 +8898,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8518,24 +8905,24 @@ msgstr[1] "{0} punkti" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Viga {0} parsimisel" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Ei suutnud lugeda \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8544,34 +8931,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8579,69 +8966,154 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +msgid "Override position for: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Midagi pole valitud!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8650,9 +9122,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8661,134 +9129,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 +#, java-format +msgid "Unable to get canonical path for directory {0}\n" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 +#, java-format +msgid "Scanning directory {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 -#, java-format -msgid "Scanning directory {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 -#, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8796,52 +9186,97 @@ msgstr[1] "pildid" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Faili ei leitud" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Vaateseadistused" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Mängi eelmine järjehoidja" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Lülita ümber: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +msgid "Delete File from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +msgid "Show next Image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8850,5 +9285,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8945,4 +9380,12 @@ msgid "Error displaying URL" msgstr "Viga URL kuvamisel" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9155,7 +9598,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "" @@ -9224,6 +9666,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "" @@ -9502,5 +9944,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 msgid "Configure available plugins." -msgstr "" +msgstr "Saadaolevate pistikrakenduste konfigureerimine." #. buttons at the bottom @@ -9608,30 +10050,89 @@ msgstr "Projektsiooni {0} ei saa aktiveerida. Kasutan Mercatori" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Haigla" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Sport" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Salasõna" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM parool" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." msgstr "" @@ -9912,5 +10413,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9920,13 +10421,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9934,18 +10435,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Valikulised tunnused:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "suletud tee" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Tundmatu tüüp: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9956,16 +10457,16 @@ msgstr "Ei saa lugeda sildistamise eelseadeid: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Viga sõelumisel {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Elemente tüübist {0} toetatakse." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -9974,18 +10475,18 @@ msgstr[1] "Muuda {0} objekti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Midagi pole valitud!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Muuda seadeid" @@ -10014,4 +10515,11 @@ msgstr "Laen alla punkte alates {0} kuni {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10027,12 +10535,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, arvatavasti puuduvad mõned sildid (tag)." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Valmistan andmeid ette..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10133,16 +10696,16 @@ msgstr "Parse error: vigane gpx dokumendi struktuur" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10152,40 +10715,40 @@ msgstr "Laen alla OSM andmeid..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10193,10 +10756,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Laen alla punkte alates {0} kuni {1}..." -msgstr[1] "Laen alla punkte alates {0} kuni {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10233,14 +10796,14 @@ msgstr "NMEA impordi viga!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10249,16 +10812,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10266,66 +10829,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Sulgen muutustekogumit..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Ettevalmistus..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Üleslaadimine..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Valmistan andmeid ette..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Muuda {0} objekt" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "Jooksev muutustekogum on tühi. Ei saa andmeid üles laadida." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10351,4 +10925,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10360,5 +10944,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10385,5 +10969,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10391,5 +10975,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10402,5 +10986,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10411,57 +10995,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Vale salasõna või kasutajanimi." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Ettevaatust: Salasõna saadetakse krüpteerimata." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Salvesta kasutaja ja salasõna (krüpteerimata)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Sisesta salasõna" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM parool" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10551,5 +11084,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10558,38 +11098,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10597,19 +11137,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Puudulik määratlus ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Keelatud objekti number id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10619,8 +11159,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10630,25 +11170,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10656,5 +11212,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10663,5 +11219,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10669,5 +11225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10676,13 +11232,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Valmistan ette OSM andmeid..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10705,21 +11261,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Laen avatud muutustekogumeid alla ..." +msgstr[1] "Laen avatud muutustekogumeid alla ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Laen avatud muutustekogumeid alla ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10747,9 +11315,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10808,5 +11372,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10816,4 +11380,9 @@ msgid "Uploading data ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Kustutatud või nihutatud primitiivid" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10825,5 +11394,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158 msgid "Download Plugins" -msgstr "" +msgstr "Pistikrakenduste allalaadimine" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 @@ -10855,7 +11424,7 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Kustuta {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 @@ -10914,5 +11483,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Update plugins" -msgstr "" +msgstr "Pistikrakenduste uuendamine" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 @@ -10998,9 +11567,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "kirjeldust pole saadaval" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11024,5 +11593,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 msgid "All installed plugins are up to date." -msgstr "Kõik installeeritud pluginad on uuendatud." +msgstr "Kõik installeeritud pistikrakendused on uuendatud." #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119 @@ -11033,5 +11602,5 @@ "{0}" msgstr "" -"Uuenda järgnevad pluginad:\n" +"Uuenda järgnevad pistikrakendused:\n" "\n" "{0}" @@ -11128,4 +11697,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11415,6 +11999,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "" @@ -11500,5 +12084,5 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "" @@ -11509,5 +12093,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "" @@ -11522,11 +12106,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11543,17 +12124,14 @@ #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "looduslik" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "pilt" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Valimisringkond" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11571,7 +12149,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "siseosa" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11684,5 +12261,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11744,21 +12321,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11767,13 +12344,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11798,17 +12375,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11820,18 +12397,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11839,5 +12416,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11845,52 +12422,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12092,5 +12666,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12281,5 +12855,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Andmeid ei laetud." @@ -12301,9 +12875,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12689,7 +13263,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "" @@ -12838,19 +13412,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "" @@ -12889,32 +13463,32 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 +msgid "Capture GPS Track" +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +msgid "Connect to gpsd server and show current position in LiveGPS layer." +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 +msgid "Center Once" +msgstr "" + #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 -msgid "Capture GPS Track" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -msgid "Connect to gpsd server and show current position in LiveGPS layer." -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 -msgid "Center Once" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 msgid "Center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "" @@ -12965,9 +13539,9 @@ msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "" @@ -13005,5 +13579,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13014,13 +13588,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13161,5 +13735,5 @@ msgstr "" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13251,5 +13825,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13325,41 +13899,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13528,4 +14102,42 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Tänavad" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Punkti number" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13544,41 +14156,19 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" msgstr "" @@ -13594,5 +14184,5 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "" @@ -14239,38 +14829,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "" @@ -14284,5 +14844,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "" @@ -14397,10 +14957,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15098,6 +15658,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "" @@ -15543,5 +16103,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "" @@ -15659,5 +16219,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15669,5 +16229,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "mets" @@ -15925,4 +16485,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -15954,8 +16517,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "" @@ -16103,9 +16668,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "" @@ -16350,5 +16916,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "" @@ -16383,5 +16949,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "" @@ -16415,6 +16981,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "" @@ -16464,5 +17030,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "" @@ -16650,6 +17216,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Matkamine" @@ -16770,5 +17336,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16794,4 +17359,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16801,15 +17367,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operaatorfirma" @@ -17021,7 +17587,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "" @@ -17440,5 +18006,5 @@ msgstr "" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17448,5 +18014,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "" @@ -17972,32 +18538,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Avatud" @@ -18056,91 +18622,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18155,5 +18721,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18172,7 +18738,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "" @@ -18188,5 +18754,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "" @@ -18199,6 +18765,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "" @@ -18237,22 +18803,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Pood" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "" @@ -18260,5 +18814,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "" @@ -18267,10 +18821,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "" @@ -18278,5 +18832,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "" @@ -18284,10 +18838,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "" @@ -18296,22 +18850,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Avalik transport" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18321,5 +18868,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18327,5 +18874,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18333,5 +18880,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -18339,5 +18886,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -18345,5 +18892,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -18352,5 +18899,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -18358,5 +18905,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -18365,5 +18912,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -18375,5 +18922,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18381,10 +18928,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "" @@ -18393,10 +18940,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -18405,5 +18952,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "" @@ -18412,5 +18959,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "" @@ -18418,5 +18965,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "" @@ -18426,5 +18973,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "" @@ -18433,17 +18980,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "" @@ -18451,5 +19006,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "" @@ -18457,5 +19012,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "" @@ -18463,5 +19018,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "" @@ -18469,15 +19024,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "" @@ -18485,10 +19040,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Majutus" @@ -18500,5 +19055,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -18507,15 +19062,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "" @@ -18523,20 +19078,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "" @@ -18544,10 +19099,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "" @@ -18555,30 +19110,30 @@ #. item "Travel/Accomodation/Hostel" #. +#: build/trans_presets.java:1596 +msgid "Edit Hostel" +msgstr "" + +#. item "Travel/Accomodation/Hostel" text "Name" +#: build/trans_presets.java:1600 +msgid "Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" +#: build/trans_presets.java:1601 +msgid "Edit Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" text "Elevation" +#: build/trans_presets.java:1606 +msgid "Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" #: build/trans_presets.java:1607 -msgid "Edit Hostel" -msgstr "" - -#. item "Travel/Accomodation/Hostel" text "Name" +msgid "Edit Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" text "Name" #: build/trans_presets.java:1611 -msgid "Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 -msgid "Edit Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 -msgid "Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 -msgid "Edit Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 msgid "Camping Site" msgstr "" @@ -18586,10 +19141,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Toit ja jook" @@ -18600,5 +19155,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restoran" @@ -18606,5 +19161,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "" @@ -18612,5 +19167,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "" @@ -18618,61 +19173,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "kohalik" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Kiirtoit" @@ -18680,9 +19235,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Kohvik" @@ -18690,9 +19245,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pubi" @@ -18700,18 +19255,18 @@ #. item "Food+Drinks/Pub" #. +#: build/trans_presets.java:1644 +msgid "Edit Pub" +msgstr "" + +#: build/trans_presets.java:1649 +msgid "Biergarten" +msgstr "" + +#. item "Food+Drinks/Biergarten" +#: build/trans_presets.java:1650 +msgid "Edit Biergarten" +msgstr "" + #: build/trans_presets.java:1655 -msgid "Edit Pub" -msgstr "" - -#: build/trans_presets.java:1660 -msgid "Biergarten" -msgstr "" - -#. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 -msgid "Edit Biergarten" -msgstr "" - -#: build/trans_presets.java:1666 msgid "Bar" msgstr "Baar" @@ -18719,9 +19274,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Ööklubi" @@ -18729,24 +19284,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turism" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Vaatamisväärsus" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Muuseum" @@ -18754,9 +19309,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Loomaaed" @@ -18765,9 +19320,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "" @@ -18775,24 +19330,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Teemapark" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "" @@ -18800,5 +19355,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "" @@ -18806,19 +19361,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Infopunkt" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Kaart" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18856,5 +19411,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18862,28 +19417,28 @@ msgstr "tänav" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -18893,5 +19448,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18899,6 +19454,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "" @@ -18906,5 +19461,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -18912,6 +19467,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Suusatamine" @@ -18919,5 +19474,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -18925,46 +19480,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -18972,29 +19527,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "" @@ -19002,25 +19557,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Lõkkease" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Piknikuplats" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Ajaloolised kohad" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Loss" @@ -19029,19 +19584,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Varemed" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "" @@ -19050,9 +19605,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "" @@ -19060,10 +19615,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19071,5 +19626,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19077,15 +19632,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monument" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Mälestusmärk" @@ -19093,55 +19648,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 msgid "Leisure" msgstr "Puhkus" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Veepark" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Mänguväljak" @@ -19149,35 +19704,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Kalapüük" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Sport" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Staadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "" @@ -19191,6 +19746,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "vali spordiala:" @@ -19582,30 +20137,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "" @@ -19615,225 +20170,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "kanuu" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "ameerika_jalgpall" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "suusatamine" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "jalgpall" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "lauatennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfiväljak" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Miniatuurne golf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Mitu" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -19872,21 +20427,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "tüüp" @@ -19925,203 +20480,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Kergejõustik" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Vibusport" #. item "Sport/Archery" +#: build/trans_presets.java:1954 +msgid "Edit Archery" +msgstr "" + +#: build/trans_presets.java:1959 +msgid "Climbing" +msgstr "" + +#. item "Sport/Climbing" +#: build/trans_presets.java:1960 +msgid "Edit Climbing" +msgstr "" + #: build/trans_presets.java:1965 -msgid "Edit Archery" -msgstr "" - -#: build/trans_presets.java:1970 -msgid "Climbing" -msgstr "" - -#. item "Sport/Climbing" -#: build/trans_presets.java:1971 -msgid "Edit Climbing" -msgstr "" - -#: build/trans_presets.java:1976 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" +#: build/trans_presets.java:1966 +msgid "Edit Canoeing" +msgstr "" + +#. item "Sport/Cycling" +#: build/trans_presets.java:1972 +msgid "Edit Cycling" +msgstr "" + #: build/trans_presets.java:1977 -msgid "Edit Canoeing" -msgstr "" - -#. item "Sport/Cycling" +msgid "Dog Racing" +msgstr "" + +#. item "Sport/Dog Racing" +#: build/trans_presets.java:1978 +msgid "Edit Dog Racing" +msgstr "" + #: build/trans_presets.java:1983 -msgid "Edit Cycling" -msgstr "" - -#: build/trans_presets.java:1988 -msgid "Dog Racing" -msgstr "" - -#. item "Sport/Dog Racing" +msgid "Equestrian" +msgstr "" + +#. item "Sport/Equestrian" +#: build/trans_presets.java:1984 +msgid "Edit Equestrian" +msgstr "" + #: build/trans_presets.java:1989 -msgid "Edit Dog Racing" -msgstr "" - -#: build/trans_presets.java:1994 -msgid "Equestrian" -msgstr "" - -#. item "Sport/Equestrian" +msgid "Horse Racing" +msgstr "" + +#. item "Sport/Horse Racing" +#: build/trans_presets.java:1990 +msgid "Edit Horse Racing" +msgstr "" + #: build/trans_presets.java:1995 -msgid "Edit Equestrian" -msgstr "" - -#: build/trans_presets.java:2000 -msgid "Horse Racing" -msgstr "" - -#. item "Sport/Horse Racing" +msgid "Gymnastics" +msgstr "" + +#. item "Sport/Gymnastics" +#: build/trans_presets.java:1996 +msgid "Edit Gymnastics" +msgstr "" + #: build/trans_presets.java:2001 -msgid "Edit Horse Racing" -msgstr "" - -#: build/trans_presets.java:2006 -msgid "Gymnastics" -msgstr "" - -#. item "Sport/Gymnastics" +msgid "Motor Sports" +msgstr "" + +#. item "Sport/Motor Sports" +#: build/trans_presets.java:2002 +msgid "Edit Motor Sports" +msgstr "" + #: build/trans_presets.java:2007 -msgid "Edit Gymnastics" -msgstr "" - -#: build/trans_presets.java:2012 -msgid "Motor Sports" -msgstr "" - -#. item "Sport/Motor Sports" +msgid "Skating" +msgstr "" + +#. item "Sport/Skating" +#: build/trans_presets.java:2008 +msgid "Edit Skating" +msgstr "" + #: build/trans_presets.java:2013 -msgid "Edit Motor Sports" -msgstr "" - -#: build/trans_presets.java:2018 -msgid "Skating" -msgstr "" - -#. item "Sport/Skating" +msgid "Skateboard" +msgstr "" + +#. item "Sport/Skateboard" +#: build/trans_presets.java:2014 +msgid "Edit Skateboard" +msgstr "" + #: build/trans_presets.java:2019 -msgid "Edit Skating" -msgstr "" - -#: build/trans_presets.java:2024 -msgid "Skateboard" -msgstr "" - -#. item "Sport/Skateboard" -#: build/trans_presets.java:2025 -msgid "Edit Skateboard" -msgstr "" - -#: build/trans_presets.java:2030 msgid "Swimming" msgstr "Ujumine" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "" @@ -20129,56 +20684,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "mägi" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "murdmaa" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "lumepark" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Raskusaste" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "kerge" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "ekspert" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Lasketiir" @@ -20186,182 +20741,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Jalgpall" #. item "Sport (Ball)/Soccer" +#: build/trans_presets.java:2044 +msgid "Edit Soccer" +msgstr "" + +#: build/trans_presets.java:2049 +msgid "Football" +msgstr "" + +#. item "Sport (Ball)/Football" +#: build/trans_presets.java:2050 +msgid "Edit Football" +msgstr "" + #: build/trans_presets.java:2055 -msgid "Edit Soccer" -msgstr "" - -#: build/trans_presets.java:2060 -msgid "Football" -msgstr "" - -#. item "Sport (Ball)/Football" +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2056 +msgid "Edit Australian Football" +msgstr "" + #: build/trans_presets.java:2061 -msgid "Edit Football" -msgstr "" - -#: build/trans_presets.java:2066 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 -msgid "Edit Australian Football" -msgstr "" - -#: build/trans_presets.java:2072 msgid "Baseball" msgstr "Pesapall" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Vali pesapall" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Korvpall" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Vali korvpall" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "Golfiväljak" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" +#: build/trans_presets.java:2080 +msgid "Edit Boule" +msgstr "" + +#: build/trans_presets.java:2085 +msgid "Bowls" +msgstr "" + +#. item "Sport (Ball)/Bowls" +#: build/trans_presets.java:2086 +msgid "Edit Bowls" +msgstr "" + #: build/trans_presets.java:2091 -msgid "Edit Boule" -msgstr "" - -#: build/trans_presets.java:2096 -msgid "Bowls" -msgstr "" - -#. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 -msgid "Edit Bowls" -msgstr "" - -#: build/trans_presets.java:2102 msgid "Cricket" msgstr "Kriket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Vali kriket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "" #. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + +#: build/trans_presets.java:2103 +msgid "Croquet" +msgstr "" + +#. item "Sport (Ball)/Croquet" +#: build/trans_presets.java:2104 +msgid "Edit Croquet" +msgstr "" + #: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 -msgid "Croquet" -msgstr "" - -#. item "Sport (Ball)/Croquet" +msgid "Hockey" +msgstr "" + +#. item "Sport (Ball)/Hockey" +#: build/trans_presets.java:2110 +msgid "Edit Hockey" +msgstr "" + #: build/trans_presets.java:2115 -msgid "Edit Croquet" -msgstr "" - -#: build/trans_presets.java:2120 -msgid "Hockey" -msgstr "" - -#. item "Sport (Ball)/Hockey" +msgid "Pelota" +msgstr "" + +#. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + #: build/trans_presets.java:2121 -msgid "Edit Hockey" -msgstr "" - -#: build/trans_presets.java:2126 -msgid "Pelota" -msgstr "" - -#. item "Sport (Ball)/Pelota" +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 msgid "Rugby" msgstr "Ragbi" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Vali ragbi" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Laua tennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Vali laua tennis" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Vali tennis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Ehitised" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Ehirus" @@ -20369,5 +20924,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Avalik hoone" @@ -20375,10 +20930,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Raekoda" @@ -20386,10 +20941,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Vali raekoda" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Saatkond" @@ -20397,10 +20952,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Vali saatkond" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Kohtumaja" @@ -20409,10 +20964,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Vali kohtumaja" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Vangla" @@ -20421,10 +20976,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Vali vangla" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Politsei" @@ -20434,10 +20989,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Vali politsei" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Tuletõrjedepoo" @@ -20446,10 +21001,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Vali tuletõrjedepoo" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Postkontor" @@ -20457,5 +21012,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "" @@ -20463,15 +21018,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Lasteaed" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Vali lasteaed" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Kool" @@ -20479,10 +21034,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Vali kool" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Ülikool" @@ -20490,10 +21045,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Vali ülikool" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Kolledž" @@ -20501,5 +21056,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Vali kolledž" @@ -20507,5 +21062,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Kino" @@ -20514,10 +21069,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Vali kino" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Raamatukogu" @@ -20526,9 +21081,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Vali raamatukogu" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "" @@ -20536,10 +21091,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Teater" @@ -20548,10 +21103,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Vali teater" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Palvekoht" @@ -20561,5 +21116,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Vali palvekoht" @@ -20568,6 +21123,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religioon" @@ -20576,66 +21131,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "budist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "kristlane" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "juudi" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "moslem" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrism (pärsia)" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Usutunnistus" @@ -20644,81 +21199,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglikaan" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "katoliku" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangeelne" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "jehoovatunnistajad" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "luterlane" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "metodist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormoon" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "ortodoksne" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "nelipühalane" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbüterlane" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestantlik" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "kveeker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "šiia" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Aadressid" @@ -20727,5 +21282,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Vali aadressi infot" @@ -20733,5 +21288,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Maja number" @@ -20739,20 +21294,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Maja nimi" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Linna nimi" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Posti kood" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Riigi kood" @@ -20761,5 +21321,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "" @@ -20767,61 +21327,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "paaritu" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "paaris" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Inimtekkeline" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Töökojad" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Vali töökojad" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Torn" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Vali torn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20829,25 +21389,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Veetorn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Vali veetorn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gaasimahuti" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Vali gaasimahuti" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Majakas" @@ -20855,10 +21415,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Vali majakas" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Tuuleveski" @@ -20866,10 +21426,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Vali tuuleveski" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Torustik" @@ -20878,37 +21438,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Vali torustik" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "õli" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gaas" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "" @@ -20918,10 +21478,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Kraana" @@ -20929,10 +21489,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Vali kraana" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Tuletorn" @@ -20940,10 +21500,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Vali tuletorn" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Geodeetiline punkt" @@ -20951,10 +21511,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Vali ülevaatlus punkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "järelvalve" @@ -20962,5 +21522,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Vali järelvalve kaamera" @@ -20968,5 +21528,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Elektri generaator" @@ -20976,35 +21536,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Vali elektri generaator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "tuul" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "hüdro" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fosiil" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "tuuma" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "süsi" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "päikeseenergia" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Elektrijaam" @@ -21013,10 +21573,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Vali elektrijaam" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Elektrialajaam" @@ -21025,5 +21585,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Vali elektri alajaam" @@ -21031,10 +21591,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "" @@ -21045,23 +21605,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "" @@ -21070,75 +21630,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "Joonetüüp" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "joon" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Pinge" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "üksik" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "topelt" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "kolmekordne" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Teenused" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Tualetid" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Märkus" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefon" @@ -21147,5 +21707,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "" @@ -21153,5 +21713,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Mündid" @@ -21159,5 +21719,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Märkused" @@ -21165,5 +21725,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21171,5 +21731,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Deebetkaart" @@ -21177,15 +21737,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Krediitkaart" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefoni kaart" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Jäätmekäitlus" @@ -21194,5 +21754,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Muuda jäätmekäitlusjaam" @@ -21200,68 +21760,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Battareid" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Riided" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Klaas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Paber" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Vanaraud" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "Materjal" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "kivi" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "plastikust" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "Värv" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "must" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "pruun" @@ -21332,39 +21887,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "roheala" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "punane" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "sinine" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "hall" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "valge" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Jahikantsel" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Muuda jahiala" @@ -21373,30 +21928,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Kõrgus" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "madal" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "pool" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "täis" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Peida" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Lukusta" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Purskaev" @@ -21405,10 +21960,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Vali purskaev" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Joogi vesi" @@ -21417,10 +21972,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Vali joogivee asukoht" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21428,33 +21983,56 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Poed" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +msgid "Bike Dealer" +msgstr "" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Vali Supermarket" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Nurgakauplus" @@ -21462,9 +22040,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Vali nurgakauplus" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosk" @@ -21472,27 +22050,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Vali kiosk" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "" @@ -21500,5 +22078,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "" @@ -21506,88 +22084,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "ühistranspordi_piletid" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "ühistranspordi_plaanid" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "parkimis_pilet" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "toit" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "joogid" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "maiustused" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "suitsud" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "fotod" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "looma_toit" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "ajalehed" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "mänguasjad" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "templid" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-kaardid" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "telefoni_kaardid" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "kondoomid" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampoonid" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Lihunik" @@ -21595,9 +22173,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Vali lihunik" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Pagar" @@ -21605,9 +22183,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Vali pagar" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Lilleseadja" @@ -21615,18 +22193,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Vali lilleseadja" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Ökokaubad" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Redigeeri ökopoodi" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Alkohol" @@ -21634,54 +22212,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Redigeeri alkoholi poode" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Joogipood" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Arvuti" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Vali arvutipood" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Elektroonika" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Vali elektroonika pood" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Mööbel" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Vali mööblipood" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Aiakeskus" @@ -21689,9 +22267,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Vali aiakeskus" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Riistvara" @@ -21699,9 +22277,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Vali riistvara pood" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "" @@ -21709,54 +22287,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Kirjatarbed" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Vali kirjatarvete pood" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Juuksur" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Vali juuksur" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Jalatsid" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Vali jalatsi pood" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Mänguasjad" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Vali mänguasja pood" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Vali video pood" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Kuiir puhastus" @@ -21764,9 +22342,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Vali kiirpuhastus" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Pesumaja" @@ -21774,9 +22352,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Vali pesumaja" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Välisuks" @@ -21784,28 +22362,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Vali välisukse pood" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Vali spordi pood" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Optik" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Vali optika" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Sularaha" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Pank" @@ -21813,14 +22391,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Vali Pank" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Sularaha automaat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Raha vahetus" @@ -21828,5 +22406,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Vali rahavahetus punkt" @@ -21834,15 +22412,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Vali sularaha automaat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Tervis" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Arstid" @@ -21850,18 +22428,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Vali arstid" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Hambaarst" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Vali hambaarst" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Apteek" @@ -21869,5 +22447,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Vali Apteek" @@ -21875,9 +22453,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Retseptuur" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Haigla" @@ -21885,10 +22463,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Vali haigla" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Hädaabi tugijaam" @@ -21897,5 +22475,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Vali hädaabi tugijaam" @@ -21904,20 +22482,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Punkti number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Punkti nimi" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Telefoninumber" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -21925,5 +22503,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Loomaarst" @@ -21932,64 +22510,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Vali loomaarst" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "Geograafia" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Asukohad" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Vali kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Maa" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Vali maa" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Riik" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Vali riik" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Regioon" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Vali regioon" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Maakond" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Vali maakond" @@ -21997,15 +22575,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Linn" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Vali linn" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Linn" @@ -22013,10 +22591,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Muuda linna" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Linnaosa" @@ -22024,25 +22602,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Muuda linnaosa" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Küla/Alevik/Alev" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Muuda küla/alevik/alev" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Küla" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Muuda küla" @@ -22050,5 +22628,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Asustamata koht" @@ -22056,10 +22634,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Muuda asustamata kohta" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Saar" @@ -22067,10 +22645,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Muuda saart" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22078,5 +22656,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22084,5 +22662,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Koobas" @@ -22090,10 +22668,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Muuda koobast" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Mäetipp" @@ -22101,10 +22679,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Muuda mäetippu" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Liustik" @@ -22112,10 +22690,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Muuda liustikku" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Vulkaan" @@ -22123,70 +22701,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Muuda vulkaani" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Piirid" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Riiklikud" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Muuda riiklikke piire" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administratiivpiir" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Muuda administratiivpiire" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Omavalitsus" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Muuda omavalitsuse piire" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Valimisringkond" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Muuda valimisringkonda" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Rahvuspark" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Muuda rahvuspargi piire" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Maakasutus" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Üksik puu" @@ -22195,15 +22773,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Muuda puud" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botaaniline nimi" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Mets" @@ -22212,5 +22790,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Muuda metsa" @@ -22218,17 +22796,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "okasmets" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "lehtmets" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "segamets" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Kultuurmets" @@ -22237,14 +22815,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Muuda kultuurmetsa" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Looduskaitseala" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Muuda looduskaitseala" @@ -22252,25 +22830,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "klibu, rusukalle" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Muuda rusukallet" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Võsa" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Muuda võsa" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Langus" @@ -22278,10 +22856,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Muuda langust" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Nõmm" @@ -22289,5 +22867,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Muuda nõmme" @@ -22295,5 +22873,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Taluõu" @@ -22302,45 +22880,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Muuda taluõue" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Talumaa" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Muuda talumaad" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Niit/Karjamaa" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Muuta niitu" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Viinapuuistandus" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Muuda viinapuuistandust" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Eraldised" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Muuda eraldisi" @@ -22348,25 +22926,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Aed" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Muuda aeda" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Muru" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Muuda muru" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Külatanum" @@ -22374,10 +22952,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Muuda külatanumat" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Avalik maa" @@ -22385,20 +22963,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Muuda avalikku maad" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Muuda parki" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Puhkeala" @@ -22406,5 +22984,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Muuda puhkeala" @@ -22412,15 +22990,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Elamurajoon" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Muuda elamurajooni" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Matmispaik" @@ -22428,9 +23006,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Muuda matmispaika" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Kalmistu" @@ -22438,39 +23016,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Muuda kalmistut" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Kaubandus" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Muuda kaubandust" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Kommerts" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Muuda kommertspiirkonda" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Tööstus" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Muuda tööstuspiirkonda" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Raudtee" @@ -22478,15 +23056,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Muuda raudteed" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militaarala" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Muuda militaarala" @@ -22494,55 +23072,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Ehitustanner" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Muuda ehitustandrit" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Jäätmaa" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Muuda jäätmaad" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Roheala" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Muuda roheala" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Prügimägi" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Muuda prügimäge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Kivimurd" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Muuda kivimurdu" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Hulknurk" @@ -22552,5 +23130,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Muuda hulknurka" @@ -22559,10 +23137,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "väline osa" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "siseosa" @@ -22570,5 +23148,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Pöördekeelud" @@ -22577,5 +23155,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Muuda pöördekeelde" @@ -22583,34 +23161,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Keelud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "vasakpöörde keeld" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "parempöörde keeld" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "ei tohi otse sõita" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "ei tohi tagasi pöörata" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "ainult parempööre" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "ainult vaskpööre" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "ainult otsesõit" @@ -22619,15 +23197,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "teelt" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "üle sõlme või tee" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "teele" @@ -22635,5 +23213,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Teekond" @@ -22642,5 +23220,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Muuda teekonda" @@ -22648,5 +23226,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "teekonna tüüp" @@ -22718,24 +23296,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "jalgrattaga" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "tee" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "praam" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "suusad" @@ -22788,5 +23366,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22795,13 +23373,13 @@ msgstr "jalgsi" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "matkamine" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "tramm" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "ümbersõit" @@ -22815,10 +23393,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "metroo" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "sümboolne kirjeldus" @@ -22826,31 +23404,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Võrk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "planeeritud" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "täiendav" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "ajutine" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "ühendus" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Värv (hex)" @@ -22859,30 +23437,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "teekonna osa" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "edasisuunaline osa" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "tagasisuunaline osa" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "peatuspunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "edasisuunaline peatuspunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "tagasisuunaline peatuspunkt" @@ -23093,130 +23671,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23233,98 +23685,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "kasutusest väljas" @@ -23701,7 +24062,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "teerada" @@ -23765,13 +24126,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "raudtee" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23787,5 +24227,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "teenused" @@ -23799,5 +24239,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23818,5 +24258,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "tagasipööramisring" @@ -23831,5 +24271,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23844,5 +24284,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "jõekallas" @@ -23856,5 +24296,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "oja" @@ -23868,5 +24308,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "dokk" @@ -23888,16 +24328,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "akvedukt" - -#. color aqueduct -#. #. 1 #. 50000 @@ -23994,4 +24422,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24060,13 +24495,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "inimtekkeline" @@ -24112,6 +24547,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24128,7 +24563,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24151,10 +24586,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "muu rööbastee" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "ülarelss" @@ -24190,11 +24625,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "kasutamata raudtee" #. color rail +#. #. 1 #. 50000 @@ -24235,6 +24671,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "aeronautika" @@ -24248,5 +24684,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "lennuterminal" @@ -24268,5 +24704,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "helikopterid" @@ -24280,5 +24716,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "kerglennukid" @@ -24286,4 +24722,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24333,7 +24776,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "trosstransport" @@ -24350,5 +24793,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "suusanõlv lihtne" @@ -24363,5 +24806,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "suusanõlv keskmine" @@ -24376,5 +24819,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "suusanõlv edasijõudnutele" @@ -24389,5 +24832,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24402,5 +24845,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "suusanõlv klassita" @@ -24415,5 +24858,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "suusanõlv algajale" @@ -24533,11 +24976,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "elektrivarustus" @@ -24551,5 +24994,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "kai" @@ -24563,5 +25006,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "torujuhe" @@ -24689,12 +25132,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "puhkealad" @@ -24708,5 +25168,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "paadisadam" @@ -24744,4 +25204,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24760,4 +25236,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24778,8 +25262,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "mugavused" @@ -24881,10 +25367,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "autohooldus" @@ -25138,5 +25624,5 @@ #. #. -#. +#. #. color health #. @@ -25282,4 +25768,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25299,23 +25793,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "muud teenused" @@ -25347,6 +25841,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "vesi" @@ -25407,14 +25901,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "tervishoid" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25761,5 +26255,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25782,5 +26275,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "pood" @@ -25852,8 +26346,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotell" @@ -25954,9 +26448,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turism" @@ -26044,9 +26538,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "alalooline" @@ -26060,5 +26554,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "kivimurd" @@ -26072,5 +26566,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "prügimägi" @@ -26092,5 +26586,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "tehisjärv" @@ -26104,5 +26598,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "kultuurmets" @@ -26116,5 +26610,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "taluõu" @@ -26137,5 +26631,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "kaubandus" @@ -26149,5 +26643,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "tööstus" @@ -26161,5 +26655,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "jäätmaa" @@ -26173,5 +26667,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "rohepiirkond" @@ -26185,5 +26679,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "raudteede piirkond" @@ -26240,7 +26734,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "militaarala" @@ -26254,5 +26748,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "kalmistu" @@ -26265,5 +26759,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "mäetipp" @@ -26278,5 +26772,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "liustik" @@ -26290,5 +26784,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "vulkaan" @@ -26343,8 +26837,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "looduslik" @@ -26358,5 +26852,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "põõsastik" @@ -26370,5 +26864,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "nõmm" @@ -26382,5 +26876,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26394,5 +26888,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "muda" @@ -26406,5 +26900,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "rand" @@ -26482,8 +26976,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "teekond" @@ -26531,7 +27025,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "piir" @@ -26681,11 +27175,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "koht" @@ -26733,6 +27227,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "aadress" @@ -26981,20 +27475,20 @@ #: build/trans_wms.java:10 msgid "Yahoo Sat" -msgstr "" +msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? #: build/trans_wms.java:11 msgid "OpenStreetMap" -msgstr "" +msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? #: build/trans_wms.java:12 msgid "OpenCycleMap" -msgstr "" +msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 msgid "TilesAtHome" -msgstr "" +msgstr "TilesAtHome" #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? @@ -27013,10 +27507,10 @@ #: build/trans_wms.java:22 msgid "Terraserver Topo" -msgstr "" +msgstr "Terraserver Topo" #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& #: build/trans_wms.java:23 msgid "Terraserver Urban" -msgstr "" +msgstr "Terraserver Urban" #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& @@ -27026,10 +27520,10 @@ #: build/trans_wms.java:27 msgid "Czech CUZK:KM" -msgstr "" +msgstr "Tšehhi CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& #: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" -msgstr "" +msgstr "Tšehhi UHUL:ORTOFOTO" #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& @@ -27050,5 +27544,5 @@ #: build/trans_wms.java:35 msgid "7th Series (OS7)" -msgstr "" +msgstr "7. seeria (OS7)" #. http://ooc.openstreetmap.org/wms/map.php?source=os7& @@ -27058,20 +27552,20 @@ #: build/trans_wms.java:39 msgid "MLIT Japan (ORTHO)" -msgstr "" +msgstr "MLIT Jaapan (ORTHO)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF #: build/trans_wms.java:40 msgid "MLIT Japan (ORTHO01)" -msgstr "" +msgstr "MLIT Jaapan (ORTHO01)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF #: build/trans_wms.java:41 msgid "MLIT Japan (ORTHO02)" -msgstr "" +msgstr "MLIT Jaapan (ORTHO02)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF #: build/trans_wms.java:42 msgid "MLIT Japan (ORTHO03)" -msgstr "" +msgstr "MLIT Jaapan (ORTHO03)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF @@ -27081,13 +27575,342 @@ #: build/trans_wms.java:46 msgid "Lodi - Italy" -msgstr "" +msgstr "Lodi - Itaalia" #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& #: build/trans_wms.java:47 msgid "Sicily - Italy" -msgstr "" +msgstr "Sitsiilia - Itaalia" #~ msgid "Upload to OSM..." #~ msgstr "Lae OSMi serverisse" + +#~ msgid "Updating primitive" +#~ msgstr "Primitiivi uuendamine" + +#~ msgid "" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" +#~ msgstr "Muutuste arv ületab maksimaalse. Muutusi {0}, maksimaalselt {1}" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, arvatavasti puuduvad mõned sildid (tag)." + +#~ msgid "Preparing..." +#~ msgstr "Ettevalmistus..." + +#~ msgid "Uploading..." +#~ msgstr "Üleslaadimine..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Vale salasõna või kasutajanimi." + +#~ msgid "Enter Password" +#~ msgstr "Sisesta salasõna" + +#~ msgid "Shop" +#~ msgstr "Pood" + +#~ msgid "aqueduct" +#~ msgstr "akvedukt" + +#~ msgid "Move" +#~ msgstr "Liiguta" + +#~ msgid "Data Layer" +#~ msgstr "Andmekiht" + +#~ msgid "Select a bookmark first." +#~ msgstr "Vali enne järjehoidja." + +#~ msgid "Unknown file extension." +#~ msgstr "Tundmatu faililaiend." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada." + +#~ msgid "Email" +#~ msgstr "E-post" + +#~ msgid "Image" +#~ msgstr "Pilt" + +#~ msgid "Sync clock" +#~ msgstr "Sünkroniseeri kell" + +#~ msgid "Unsaved Changes" +#~ msgstr "Salvestamata muudatused" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Ei suuda avada eelistuste kataloogi: {0}" + +#~ msgid "Error while parsing" +#~ msgstr "Viga parsimisel" + +#~ msgid "their version:" +#~ msgstr "nende versioon:" + +#~ msgid "my version:" +#~ msgstr "minu versioon:" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM kasutajanimi (email)" + +#~ msgid "Please report a ticket at {0}" +#~ msgstr "Palun teata piletiga {0}" + +#~ msgid "Include your steps to get to the error (as detailed as possible)!" +#~ msgstr "Lisa vea tekkimise käik (nii detailselt kui võimalik)!" + +#~ msgid "Be sure to include the following information:" +#~ msgstr "Lisa kindlasti järgnev info:" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast " +#~ "uuesti ." + +#~ msgid " has zero ref" +#~ msgstr " ei oma ref" + +#~ msgid "Unknown version" +#~ msgstr "Tundmatu versioon" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest." + +#~ msgid "name" +#~ msgstr "nimi" + +#~ msgid "Cannot read place search results from server" +#~ msgstr "Ei saa lugeda kohaotsingu tulemusi serverist" + +#~ msgid "zoom" +#~ msgstr "suurendus" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada" + +#~ msgid "Use preset ''{0}'' of group ''{1}''" +#~ msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Sildid (tühi väärtus kustutab sildi)" + +#~ msgid "Occupied By" +#~ msgstr "Kasutab" + +#~ msgid "Remove Selected" +#~ msgstr "Eemalda valitud" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Lisa kõik hetkel valitud objektid liikmetena" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada" + +#~ msgid "Cannot connect to server." +#~ msgstr "Ei saa serveriga ühenduda." + +#~ msgid "Error parsing server response." +#~ msgstr "Viga serveri vastuse töötlemisel." + +#~ msgid "There were conflicts during import." +#~ msgstr "Importimisel tekkisid konfliktid." + +#~ msgid "Basic" +#~ msgstr "Lihtne" + +#~ msgid "Revert" +#~ msgstr "Taasta" + +#~ msgid "Date" +#~ msgstr "Kuupäev" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Taasta kõigi hetkel valitud objektide olek ajaloo nimekirjas valitud " +#~ "versiooniks." + +#~ msgid "Authors: {0}" +#~ msgstr "Autorid: {0}" + +#~ msgid "Merging conflicts." +#~ msgstr "Ühendan vastuolusid." + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konfliktid: {0}" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla " +#~ "laadida." + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel." + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Sobita erinevate kuuluvustega teed?" + +#~ msgid "Combine Anyway" +#~ msgstr "Sobita ikkagi." + +#~ msgid "All the ways were empty" +#~ msgstr "Kõik teed olid tühjad." + +#~ msgid "Please select at least one task to download" +#~ msgstr "Palun vali allalaadimiseks vähemalt üks toiming." + +#~ msgid "Can only edit help pages from JOSM Online Help" +#~ msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada." + +#~ msgid "Error while loading page {0}" +#~ msgstr "Viga lehekülje {0} laadimisel." + +#~ msgid "Open in Browser" +#~ msgstr "Ava sirvikus" + +#~ msgid "JOSM Online Help" +#~ msgstr "JOSM võrguabi" + +#~ msgid "History of Element" +#~ msgstr "Elemendi ajalugu." + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles " +#~ "laetud elementidel on ajalugu." + +#~ msgid "Merge Anyway" +#~ msgstr "Liida igal juhul." + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Liida erineva kuuluvusega sõlmed?" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?" + +#~ msgid "unnamed" +#~ msgstr "Nimetu" + +#~ msgid "Please select one or more closed ways of at least four nodes." +#~ msgstr "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed." + +#~ msgid "Only two nodes allowed" +#~ msgstr "Ainult kaks sõlme lubatud." + +#~ msgid "Only one node selected" +#~ msgstr "Ainult üks sõlm valitud." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Palun vali peaaegu täisnurga all kohtuvad teed." + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME parandatud)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Internal Error: Ei saa kontrollida tingimusi, kui ei ole kihti. Palun " +#~ "teata sellest veast arendajaid." + +#~ msgid "Found element in non-relation." +#~ msgstr "Leidub element, mis ei ole seotud" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Ei leitud andmeid, mida uuendada. On sul mõni andmekiht avatud ja andmed " +#~ "laaditud?" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?" + +#~ msgid "Update Data" +#~ msgstr "Uuenda andmed" + +#~ msgid "The projection could not be read from preferences. Using EPSG:4326" +#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326" + +#~ msgid "No data imported." +#~ msgstr "Andmeid ei imporditud." + +#~ msgid "Conflicting relation" +#~ msgstr "Konfliktne relatsioon" + +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti." + +#~ msgid "API initialization failed" +#~ msgstr "API initsialiseerimine ebaõnnestus" + +#~ msgid "Conflict detected" +#~ msgstr "Avastatud konflikt" + +#~ msgid "Upload to OSM API failed" +#~ msgstr "Laadimine OSM API-le ebaõnnestus" + +#~ msgid "Primitive already deleted" +#~ msgstr "Primitiiv on juba kustutatud" + +#~ msgid "No data" +#~ msgstr "Andmeid pole" + +#~ msgid "Update failed" +#~ msgstr "Uuendamine ebaõnnestus" + +#~ msgid "Edit Properties" +#~ msgstr "Seadete muutmine" + +#~ msgid "Found element in non-way." +#~ msgstr " element võib olla vaid way-s." + +#~ msgid "" +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." +#~ msgstr "" +#~ "Enne veast teatamist püüa uuendada JOSM ja kõik pistikrakendused uusima " +#~ "versioonini." #~ msgid "" @@ -27098,313 +27921,4 @@ #~ "iga muudetud primitiivi kohta eraldi päringu kasutamiseks" -#~ msgid "Sync clock" -#~ msgstr "Sünkroniseeri kell" - -#~ msgid "Image" -#~ msgstr "Pilt" - -#~ msgid "Move" -#~ msgstr "Liiguta" - -#~ msgid "Data Layer" -#~ msgstr "Andmekiht" - -#~ msgid "Select a bookmark first." -#~ msgstr "Vali enne järjehoidja." - -#~ msgid "File could not be found." -#~ msgstr "Faili ei leitud" - -#~ msgid "Unknown file extension." -#~ msgstr "Tundmatu faililaiend." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada." - -#~ msgid "Email" -#~ msgstr "E-post" - -#~ msgid "Unsaved Changes" -#~ msgstr "Salvestamata muudatused" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Ei suuda avada eelistuste kataloogi: {0}" - -#~ msgid "Error while parsing" -#~ msgstr "Viga parsimisel" - -#~ msgid "their version:" -#~ msgstr "nende versioon:" - -#~ msgid "my version:" -#~ msgstr "minu versioon:" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "OSM username (email)" -#~ msgstr "OSM kasutajanimi (email)" - -#~ msgid "Please report a ticket at {0}" -#~ msgstr "Palun teata piletiga {0}" - -#~ msgid "Include your steps to get to the error (as detailed as possible)!" -#~ msgstr "Lisa vea tekkimise käik (nii detailselt kui võimalik)!" - -#~ msgid "Be sure to include the following information:" -#~ msgstr "Lisa kindlasti järgnev info:" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast " -#~ "uuesti ." - -#~ msgid " has zero ref" -#~ msgstr " ei oma ref" - -#~ msgid "Unknown version" -#~ msgstr "Tundmatu versioon" - -#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -#~ msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n" - -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest." - -#~ msgid "name" -#~ msgstr "nimi" - -#~ msgid "Cannot read place search results from server" -#~ msgstr "Ei saa lugeda kohaotsingu tulemusi serverist" - -#~ msgid "zoom" -#~ msgstr "suurendus" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada" - -#~ msgid "Use preset ''{0}'' of group ''{1}''" -#~ msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''" - -#~ msgid "Use preset ''{0}''" -#~ msgstr "Kasuta eelseadet \"{0}\"" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Sildid (tühi väärtus kustutab sildi)" - -#~ msgid "Occupied By" -#~ msgstr "Kasutab" - -#~ msgid "Remove Selected" -#~ msgstr "Eemalda valitud" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Lisa kõik hetkel valitud objektid liikmetena" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada" - -#~ msgid "Cannot connect to server." -#~ msgstr "Ei saa serveriga ühenduda." - -#~ msgid "Error parsing server response." -#~ msgstr "Viga serveri vastuse töötlemisel." - -#~ msgid "There were conflicts during import." -#~ msgstr "Importimisel tekkisid konfliktid." - -#~ msgid "Basic" -#~ msgstr "Lihtne" - -#~ msgid "Revert" -#~ msgstr "Taasta" - -#~ msgid "Date" -#~ msgstr "Kuupäev" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Taasta kõigi hetkel valitud objektide olek ajaloo nimekirjas valitud " -#~ "versiooniks." - -#~ msgid "Authors: {0}" -#~ msgstr "Autorid: {0}" - -#~ msgid "Merging conflicts." -#~ msgstr "Ühendan vastuolusid." - -#~ msgid "Conflicts: {0}" -#~ msgstr "Konfliktid: {0}" - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla " -#~ "laadida." - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel." - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Sobita erinevate kuuluvustega teed?" - -#~ msgid "Combine Anyway" -#~ msgstr "Sobita ikkagi." - -#~ msgid "All the ways were empty" -#~ msgstr "Kõik teed olid tühjad." - -#~ msgid "Please select at least one task to download" -#~ msgstr "Palun vali allalaadimiseks vähemalt üks toiming." - -#~ msgid "Can only edit help pages from JOSM Online Help" -#~ msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada." - -#~ msgid "Error while loading page {0}" -#~ msgstr "Viga lehekülje {0} laadimisel." - -#~ msgid "Open in Browser" -#~ msgstr "Ava sirvikus" - -#~ msgid "JOSM Online Help" -#~ msgstr "JOSM võrguabi" - -#~ msgid "History of Element" -#~ msgstr "Elemendi ajalugu." - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles " -#~ "laetud elementidel on ajalugu." - -#~ msgid "Merge Anyway" -#~ msgstr "Liida igal juhul." - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "Liida erineva kuuluvusega sõlmed?" - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?" - -#~ msgid "unnamed" -#~ msgstr "Nimetu" - -#~ msgid "Please select one or more closed ways of at least four nodes." -#~ msgstr "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed." - -#~ msgid "Only two nodes allowed" -#~ msgstr "Ainult kaks sõlme lubatud." - -#~ msgid "Only one node selected" -#~ msgstr "Ainult üks sõlm valitud." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Palun vali peaaegu täisnurga all kohtuvad teed." - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME parandatud)" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Internal Error: Ei saa kontrollida tingimusi, kui ei ole kihti. Palun " -#~ "teata sellest veast arendajaid." - -#~ msgid "Found element in non-relation." -#~ msgstr "Leidub element, mis ei ole seotud" - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}" - -#~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data " -#~ "layer?" -#~ msgstr "" -#~ "Ei leitud andmeid, mida uuendada. On sul mõni andmekiht avatud ja andmed " -#~ "laaditud?" - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?" - -#~ msgid "Update Data" -#~ msgstr "Uuenda andmed" - -#~ msgid "The projection could not be read from preferences. Using EPSG:4326" -#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326" - -#~ msgid "No data imported." -#~ msgstr "Andmeid ei imporditud." - -#~ msgid "Conflicting relation" -#~ msgstr "Konfliktne relatsioon" - -#~ msgid "Failed to initialize API. Please try again later." -#~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti." - -#~ msgid "API initialization failed" -#~ msgstr "API initsialiseerimine ebaõnnestus" - -#~ msgid "Missing primitive" -#~ msgstr "Puuduv primitiiv" - -#~ msgid "Conflict detected" -#~ msgstr "Avastatud konflikt" - -#~ msgid "Upload to OSM API failed" -#~ msgstr "Laadimine OSM API-le ebaõnnestus" - -#~ msgid "Primitive already deleted" -#~ msgstr "Primitiiv on juba kustutatud" - -#~ msgid "No data" -#~ msgstr "Andmeid pole" - -#~ msgid "Update failed" -#~ msgstr "Uuendamine ebaõnnestus" - -#~ msgid "Edit Properties" -#~ msgstr "Seadete muutmine" - -#~ msgid "Found element in non-way." -#~ msgstr " element võib olla vaid way-s." - -#~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before " -#~ "reporting a bug." -#~ msgstr "" -#~ "Enne veast teatamist püüa uuendada JOSM ja kõik pistikrakendused uusima " -#~ "versioonini." - #~ msgid "Helppage missing. Create it in English." #~ msgstr "Abileht puudub. Loo see English." Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 19198) +++ /applications/editors/josm/i18n/po/fi.po (revision 19199) @@ -4,11 +4,12 @@ # FIRST AUTHOR , 2008. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-12-01 17:02+0000\n" -"Last-Translator: Mika Laari \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-20 09:47+0000\n" +"Last-Translator: Teemu Koskinen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Luodaan pääikkuna" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Ohje" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Varoitus" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Ei voitu lukea tiedostoa ''{0}''.
Virhe:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Ei voitu lukea tiedostoa ''{0}''.
Virhe:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -264,5 +266,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:269 msgid "Plugins" -msgstr "Liitännäiset" +msgstr "Lisäosat" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87 @@ -270,5 +272,5 @@ msgstr "Tietoja JOSM:sta..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -277,5 +279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -284,5 +286,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -293,15 +295,20 @@ "ikkunoilla
ja viedä jonkin verran aikaa." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Jatka" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -310,29 +317,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -349,5 +357,10 @@ msgstr "Peruuta" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Voit keskeytettää solmujen yhteensulautuksen napsauttamalla tästä" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Valitse ainakin yksi jo lähetetty piste, polku tai relaatio." @@ -363,5 +376,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Yhdistä" @@ -381,15 +394,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Lisää piste..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Lisää piste syöttämällä leveyspiiri ja pituuspiiri." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -405,22 +418,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Muokkaa: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Syötä uuden pisteen koordinaatit." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Anna asteet desimaalilukuna." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatiiviset arvot tarkoittavat läntistä/eteläistä pallonpuoliskoa." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -429,5 +442,5 @@ msgstr "Leveysaste" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -436,28 +449,29 @@ msgstr "Pituusaste" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "Syötä kelvollinen leveyspiiri väliltä -90–90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "Syötä leveyspiiri väliltä -90–90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "Syötä kelvollinen pituuspiiri väliltä -180–180" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "Syötä pituuspiiri väliltä -180–180" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -469,9 +483,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "Sulje ikkuna ja tee uusi solmu" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "Sulje ikkuna tekemättä uutta solmua" @@ -492,18 +506,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -515,5 +529,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -535,6 +549,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -581,5 +595,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "ristiriita" @@ -616,14 +630,15 @@ msgstr "Ei ristiriitoja" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Sulje avoimet muutoskokoelmat" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Sulkee avoimet muutoskokoelmat" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -633,21 +648,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Tiedosto: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Ei avonaisia muutoskokoelmia" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Ei avonaisia muutoskokoelmia" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Ladataan avonaiset muutoskokoelmat..." @@ -731,11 +746,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -813,16 +829,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -858,5 +879,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Monista" @@ -899,10 +920,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "GPX-vienti..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Vie data GPX-tiedostoon." @@ -917,12 +938,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -947,8 +968,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -959,10 +980,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -975,17 +996,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1022,22 +1043,27 @@ msgstr "Näytä tietoja OSM-pisteistä, -poluista tai -relaatioista." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Yhdistä päällekkäiset alueet" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Yhdistää alueet jotka ovat osittain toistensa päällä" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Valitse ainakin kaksi yhdistettävää polkua." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +msgstr "Vain kaksi aluetta voidaan yhdistää tällä hetkellä." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +msgstr "\"{0}\" ei ole suljettu, eikä sitä voi siten yhdistää." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1051,38 +1077,34 @@ "Oletko varma, että haluat jatkaa?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgstr "Ole hyvä ja keskeytä toiminto jos et ole varma" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgstr "Leikkauspisteitä ei löytynyt. Mitään ei muutettu." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgstr "Lisättiin piste kaikkiin leikkauskohtiin" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgstr "Korjaa relaatiot" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1090,35 +1112,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Syötä arvot kaikille ristiriidoille." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Ratkaise ristiriitoja" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgstr "Suljettu polku" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" -msgstr "" +msgstr "Yhdistä alueet -tominto" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 @@ -1162,5 +1184,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "URL" -msgstr "" +msgstr "URL" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 @@ -1281,5 +1303,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Objekteja ei voi siirtää maailman ulkopuolelle" @@ -1359,28 +1381,28 @@ msgstr "Lataa dataa" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Suorakulmaista muoto" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1389,9 +1411,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1403,16 +1425,16 @@ "projektiota päästäksesi eroon tästä varoituksesta.
Haluatko jatkaa?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Suorakulmaista" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Käyttö" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Suorakulmaista" +msgstr "Valittuja objekteja ei voi suorakulmaistaa" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1485,18 +1507,18 @@ msgstr "Ei voitu nimetä uudelleen tiedostoa ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Käännä polut" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Kääntää valittujen polkujen suunnan." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Valitse ainakin yksi polku." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Käännä polut" @@ -1505,10 +1527,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Tallenna" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Tallenna tämänhetkinen data." @@ -1565,10 +1587,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Tallenna nimellä..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Tallenna data uuteen tiedostoon." @@ -1611,6 +1633,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1643,10 +1664,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" msgid_plural "Simplify Way (remove {0} nodes)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Yksinkertaista polku (poista {0} piste)" +msgstr[1] "Yksinkertaista polku (poista {0} pistettä)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1706,5 +1727,5 @@ "pisteitä, jotka eivät ole polun päissä.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1714,11 +1735,13 @@ "tulisi tarkistaa että jäsenyydet ovat oikein." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " "this and correct it when necessary." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +"Relaatiojäsenyydet kopioitiin kaikkiin uusiin polkuihi.
Ole hyvä ja " +"varmista että roolit ovat oikein." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1752,34 +1775,34 @@ msgstr "Tämä piste ei ole yhdistettynä mihinkään muuhun." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Mikään valituista pisteistä ei ole useammassa kuin yhdessä polussa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Mikään valitun polun pisteistä ei ole osana muita polkuja." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Tämän hetkistä valintaa ei voi käyttää polkujen erotukseen." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Valitse joko:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Yksi piste jolla on tageja, tai" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Yksi piste, joka on useamman polun käytössä, tai" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1788,5 +1811,5 @@ "polkujen käytössä, tai" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1795,5 +1818,5 @@ "käytössä." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1806,9 +1829,9 @@ "kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Irroitettu piste" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1816,5 +1839,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1849,10 +1872,10 @@ msgstr "Poista valinnat (escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Päivitä tietoa" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1860,53 +1883,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Päivitä valitut objektit" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "Päivittää valitut objektit palvelimelta (uudelleenlataa tiedot)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Päivitä valinta" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "Objekteja ei ole valittuna päivitettäväksi" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Valinta tyhjä" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Lähetä tietoa" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1917,5 +1936,5 @@ "ensin." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1923,131 +1942,7 @@ msgstr "Ei lähetettäviä muutoksia." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Ei mitään lähetettävää. Hae ensin dataa." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synkronoi koko tiedosto" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Muutoskokoelma suljettu" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2182,9 +2077,9 @@ msgstr "Ladattu GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Ladataan dataa" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2192,5 +2087,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2261,7 +2156,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2279,58 +2174,52 @@ "käyttävät polut." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Piirrä" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Piirrä pisteitä" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "valitut" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Maailman ulkopuolelle ei voi lisätä pistettä." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Lisää piste" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Lisää piste polkuun" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Yhdistä olemassa oleva polku pisteeseen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Lisää uusi piste olemassa olevaan polkuun" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Lisää piste polkuun ja yhdistä" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Luo uusi piste." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Valitse kursorin alla oleva piste." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2339,14 +2228,14 @@ msgstr[1] "Lisää uusi piste {0} polkuun." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Aloita uusi polku viimeisestä pisteestä." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Jatka polkua viimeisestä pisteestä." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Lopeta piirtäminen." @@ -2368,4 +2257,5 @@ msgid "Move a segment along its normal, then release the mouse button." msgstr "" +"Siirrä segmenttiä sen normaalin suuntaisesti, sitten vapauta hiirenpainike." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2379,4 +2269,6 @@ "its normal." msgstr "" +"Raahaa segmenttiä luodaksesi suorakulimon. Raahaa ctrl-näppäin pohjassa " +"siirtääksesi segmenttiä sen normaalin suuntaisesti." #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2386,18 +2278,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Valitse" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Valitse, siirrä ja kierrä objekteja" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2406,17 +2299,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move elements" +msgstr "Siirrä objekteja" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Toteuta siirto" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Kumoa siirto" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2425,23 +2318,26 @@ "Really move them?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +"Siirtämäsi objektien määrä on yli {0}. Monen objektin siirto on usein " +"virhe.\n" +"Haluatko varmasti siirtää ne?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +msgstr "Siirrä aina, äläkä näytä tätä kysymystä enää" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2451,5 +2347,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zoomaus" @@ -2473,5 +2369,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Etsi objekteja." @@ -2505,5 +2401,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" -msgstr "" +msgstr "Etsi valinnasta" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 @@ -2567,8 +2463,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2576,101 +2480,107 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 msgid "Filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +msgstr "Suodin" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Etsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Hakusanalla \"{0}\" ei löytynyt mitään" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Valintaan ei lisätty mitään haulla \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Valinnasta ei poistettu mitään haulla \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Löytyi {0} osumaa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2683,40 +2593,43 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Päättävä sulkumerkki puuttuu." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2725,9 +2638,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2736,7 +2649,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2770,19 +2688,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Nykyinen muutosten määrä ylittää muutosten enimmäismäärän, nykyinen on {0}, " -"enimmäismäärä on {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 -msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 #, java-format msgid "" @@ -2790,5 +2694,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 #, java-format msgid "" @@ -2797,12 +2701,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "Polussa {1} on {0} pistettä joka on enemmän kuin maksimi ({2})" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 +msgid "API Capabilities Violation" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2848,5 +2756,5 @@ #, java-format msgid "Added {0} objects" -msgstr "" +msgstr "Lisättiin {0} objekttia" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 @@ -2914,5 +2822,5 @@ msgstr "Aseta {0}={1} kohteelle {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2927,5 +2835,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -3026,4 +2934,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3135,5 +3058,5 @@ msgstr "Toteutetaanko?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3217,15 +3140,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3234,5 +3157,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3241,5 +3164,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3248,5 +3171,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3255,5 +3178,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3261,5 +3184,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3268,5 +3191,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3275,5 +3198,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3282,5 +3205,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3289,10 +3212,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3300,24 +3223,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Asetukset tallennettu kohteeseen {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Asetuksia ei voitu lähettää. Syy: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Asetuksia ei voitu ladata palvelimelta." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3326,5 +3249,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3353,5 +3276,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3373,31 +3296,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "E" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "P" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "L" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "I" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Muutoskokoelma {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3405,5 +3321,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3414,27 +3330,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3442,5 +3358,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3452,5 +3368,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3458,25 +3374,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3484,43 +3400,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Parametr ''{0}'' ei saa olla \"null\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3528,5 +3456,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3554,10 +3482,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3565,7 +3489,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3580,5 +3504,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3596,147 +3520,139 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Poistettu jäsen \"{0}\" relaatiossa." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Löytyi enemmän kuin yksi \"from\" -polku" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Löytyi enemmän kuin yksi \"to\" -polku" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Useita \"via\" -jäseniä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Tuntematon rooli \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Ei \"from\"-roolin tietä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Ei \"to\"-roolin tietä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Kiellolle {0} ei löydy piirtotyyliä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "ei tageja" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "teksti" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Virhe: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Varoitus: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "epäaktiivinen" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "valitut" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3745,6 +3661,6 @@ msgstr[1] "pistettä" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3753,7 +3669,8 @@ msgstr[1] "polkua" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3762,21 +3679,37 @@ msgstr[1] "relaatiot" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "tagiton polku" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "keskeneräinen polku" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "tausta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "korostus" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "ei tageja" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "teksti" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3918,5 +3851,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "rata" @@ -3932,7 +3865,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3948,4 +3881,10 @@ msgstr[1] "{0} jäsentä" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Muutoskokoelma {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3977,6 +3916,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Ristiriita" @@ -3990,7 +3929,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4069,74 +4008,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Käyttäjänimi" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Salasana" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "käyttö" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "valinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Näytä tämä ohje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Avaa tiedosto (gps-datana, jos *.gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Palauta oletusasetukset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Aseta kieli." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4145,9 +4084,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "esimerkkejä" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4155,36 +4094,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktivoidaan päivitetyt liitännäiset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Ladataan aikaisia liitännäisiä" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Asetetaan oletuksia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Ladataan liitännäiset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Tiedosto" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4199,22 +4138,22 @@ msgstr "Muokkaa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Näytä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Työkalut" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Esivalinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4222,5 +4161,5 @@ msgstr "Valikko: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Ääni" @@ -4299,13 +4238,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "taso ei ole listassa." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4338,5 +4278,5 @@ msgstr "Alustetaan" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4344,6 +4284,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4352,5 +4292,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4359,5 +4299,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4366,25 +4306,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4392,9 +4332,9 @@ msgstr "Rooli" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4426,11 +4366,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4439,6 +4379,6 @@ msgstr "Tagit" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4446,6 +4386,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4453,40 +4393,40 @@ msgstr "Jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4494,21 +4434,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4540,22 +4480,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4563,5 +4503,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4569,30 +4509,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4600,5 +4540,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4606,14 +4546,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4621,5 +4561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4627,23 +4567,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4654,27 +4594,27 @@ msgstr "Poista" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4683,5 +4623,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4690,5 +4630,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4697,5 +4637,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4704,5 +4644,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4711,5 +4651,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4719,5 +4659,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4952,10 +4892,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4965,10 +4905,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5053,9 +4993,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5063,6 +5003,6 @@ msgstr "ei mitään" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "kaikki" @@ -5151,7 +5091,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5161,6 +5101,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5268,4 +5208,58 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Poista valitut objektit." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Muutoskokoelma {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "Lataa lista avonaisista muutoskokoelmista palvelimelta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +#, fuzzy +msgid "Select all objects assigned to the currently selected changesets" +msgstr "Sulje valittuna oleva avoin muutoskokoelma" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Lataa" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Lataa karttadataa OSM-palvelimelta." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Suljet valitut avonaiset muutoskokoelmat" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Avaa valittu relaatio muokkaimeen" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5280,12 +5274,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5303,18 +5297,18 @@ msgstr "Komentolista: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Selvitä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5322,25 +5316,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5352,26 +5346,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5382,41 +5376,41 @@ msgstr "Lisää" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5455,5 +5449,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5468,34 +5462,34 @@ msgstr "Avaa lista kaikista ladatuista tasoista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Poista valittu taso." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Näytä/piilota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Näytä/piilota valittu taso." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Siirrä valittu taso rivi ylöspäin." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Siirrä valittu taso rivi alaspäin." @@ -5505,5 +5499,177 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relaatiot" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Avaa lista kaikista relaatioista." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relaatiot: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Avaa valittu relaatio muokkaimeen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Poista valittu relaatio" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Luo uusi relaatio" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Tämänhetkinen valinta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Avaa valintaikkuna." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Sovita näkymä valittuihin kohteisiin" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Sovita näkymä valintaan" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Valinta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Valinta: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Irroita paneeli" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Sulje tämä paneeli. Voit avata sen uudestaan vasemmassa reunassa sijaitsevan " +"työkalupalkin napista." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Tekijät" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Näytä valittujen kohteiden muokkaajat." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Tekijä" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Objektia" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "keskeneräinen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "Sulje" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Ladataan muutoskokoelmia..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5512,22 +5678,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Muutetaanko arvot?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5536,5 +5702,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5543,228 +5709,71 @@ msgstr[1] "Olet muuttamassa {0} kohdetta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Valitse avain" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Valitse arvo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Valitse objektit, joiden ominaisuuksia haluat muokata." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Ominaisuudet/jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Valittujen objektien ominaisuudet." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Lisää ominaisuuksia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Ominaisuudet / Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Muuta relaatiota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Poista relaatiosta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Poistetaanko valinta relaatiosta {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Poista valittu avain kaikista objekteista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Poista asetukset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relaatiot" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Avaa lista kaikista relaatioista." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relaatiot: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Avaa valittu relaatio muokkaimeen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Poista valittu relaatio" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Luo uusi relaatio" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Tämänhetkinen valinta" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Avaa valintaikkuna." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Sovita näkymä valittuihin kohteisiin" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Sovita näkymä valintaan" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Valinta" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Valinta: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Irroita paneeli" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Sulje tämä paneeli. Voit avata sen uudestaan vasemmassa reunassa sijaitsevan " -"työkalupalkin napista." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Tekijät" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Näytä valittujen kohteiden muokkaajat." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Tekijä" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Objektia" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5826,19 +5835,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" -msgstr[1] "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Latauksen sijainti" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Aseta {0}={1} relaatiolle \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -5860,9 +5868,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Avaa valittu relaatio muokkaimeen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5871,14 +5878,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5888,9 +5895,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5900,15 +5907,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5916,5 +5923,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5922,20 +5929,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5944,70 +5951,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Urheilu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6016,9 +6022,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6027,48 +6033,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "Tee muutokset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 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:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 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:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Lataa jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6078,34 +6083,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6217,10 +6222,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6230,5 +6235,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6314,9 +6319,4 @@ msgid "Download Area" msgstr "Lataa alue" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Lataa" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6616,6 +6616,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6628,6 +6626,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6898,4 +6894,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7118,5 +7118,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7159,116 +7159,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Nimi" @@ -7292,15 +7292,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Tyyppi" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7471,10 +7471,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7482,5 +7482,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7488,9 +7488,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7605,6 +7605,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "tuntematon" @@ -7626,13 +7626,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Changeset info" msgstr "Muutoskokoelma" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Launch browser with information about the changeset" msgstr "Avaa muutoskokoelman tiedot selaimessa" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7666,4 +7666,131 @@ msgid "Version" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Päivitä vain piste {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Päivitä vain polku {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Päivitä vain relaatio {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synkronoi koko tiedosto" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Tietojen lähetys epäonnistui koska palvelimella on " +"uudempi versio
muokkaamastasi pisteestä, polusta tai relaatiosta." +"
Konfliktin aiheutti {0} ({1}), palvelimen versio on " +"{2}, sinun versiosi on {3}.

Paina {4} päivittääksesi " +"vain konfliktin aiheuttanut objekti.
Paina {5} " +"synkronoidaksesi kaiken datan serveriltä.
Paina {6} " +"peruuttaaksesi lähetyksen.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Tietojen lähetys epäonnistui koska palvelimella on " +"uudempi versio
muokkaamastasi pisteestä, polusta tai relaatiosta." +"

Paina {0} synkronoidaksesi kaiken datan serveriltä." +"
Paina {1} peruuttaaksesi lähetyksen.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"Tietojen lähetys epäonnistui koska yritit käyttää " +"muutoskokoelmaa {0} joka on jo suljettu ({1}).
Ole hyvä ja lähetä " +"muutoksesi uudestaan joko uuteen, tai toiseen avoinna olevaan " +"muutoskokoelmaan." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Muutoskokoelma suljettu" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "Piste on vielä käytössä" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 @@ -7683,39 +7810,149 @@ msgstr "Ei avonaista muutoskokoelmaa" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Avaa uusi muutoskokoelma" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" +"Avaa uusi muutoskokoelma ja käytä sitä seuraavan kerran lähetettäessä dataa" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Muutoskokoelmaa päivitetään..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Lähetä data avonaiseen muutoskokoelmaan" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "Sulje muutoskokoelma lähetyksen jälkeen" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" +"Valitse muutoskokoelman sulkemiseksi seuraavan datan lähetyksen jälkeen" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "Lataa lista avonaisista muutoskokoelmista palvelimelta" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "Sulje valittuna oleva avoin muutoskokoelma" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "Ole hyvä ja valitse muutoskokoelmat jotka haluat sulkea" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "Avonaiset muutoskokoelmat" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Sulje muutoskokoelmat" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "Suljet valitut avonaiset muutoskokoelmat" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "Peruuta muutoskokoelmien sulkeminen" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Muutoskokoelmaa suljetaan" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "Muutoskokoelmaa {0} suljetaan" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Syötä käyttäjänimi" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Varoitus: salasana lähetetään salaamattomana." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +msgid "Authenticate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Muuta relaatiota" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7782,5 +8019,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" @@ -7788,5 +8025,5 @@ "sulkemista?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" @@ -7794,9 +8031,9 @@ "poistamista?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7809,9 +8046,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7825,9 +8062,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7842,50 +8079,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Poistu tallentamatta" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "Poista tasoja tallentamatta. Tallentamattomat muutokset katoavat." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7893,5 +8130,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7964,40 +8201,380 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Lähetä" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Päivitä objektit" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Asetukset" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "Uuden muutoskokoelman tagit" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" +"Avaa uusi muutoskokoelma ja käytä sitä seuraavan kerran lähetettäessä dataa" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "Advanced" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Muokkaa käytettävien liitännäisten asetuksia." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Tuntematon rooli \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Lähetä muutokset" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "Lähetä muutokset" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "Virheellinen kommentti" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "Peruuta lähetys ja jatka muokkausta" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Muutoskokoelman {0} tagit" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "Lähetettävät objektit..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "Jatka lähetystä" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Tietoja" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Voit keskeytettää solmujen yhteensulautuksen napsauttamalla tästä" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Valitse lähetettävät objektit" +msgstr[1] "Valitse lähetettävät objektit" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Muutoskokoelma" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "Lähetetään {0} objektia..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "Valitse lähetettävät objektit" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "Peruuta lähetys" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Ole hyvä ja valitse poistettava rivi." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" +"Avaa uusi muutoskokoelma ja käytä sitä seuraavan kerran lähetettäessä dataa" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Lisättävät objektit:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Muokattavat objektit:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Poistettavat objektit:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8006,5 +8583,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8013,5 +8590,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8020,211 +8597,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Lähetä muutokset" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "Lähetä muutokset" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "Virheellinen kommentti" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Ole hyvä ja lisää halutut koordinaatit ensin." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "Peruuta lähetys ja jatka muokkausta" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "Avaa uusi muutoskokoelma" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" -"Avaa uusi muutoskokoelma ja käytä sitä seuraavan kerran lähetettäessä dataa" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "Käytä avonaista muutoskokoelmaa" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Lähetä data avonaiseen muutoskokoelmaan" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "Sulje muutoskokoelma lähetyksen jälkeen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" -"Valitse muutoskokoelman sulkemiseksi seuraavan datan lähetyksen jälkeen" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Muutoskokoelman {0} tagit" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "Lataa lista avonaisista muutoskokoelmista palvelimelta" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "Sulje valittuna oleva avoin muutoskokoelma" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "Lähetettävät objektit..." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "Valitse lähetettävät objektit" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "Peruuta lähetys" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "Jatka lähetystä" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Lähetä kaikki muutokset yhtenä pyyntönä" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} metriä" -msgstr[1] "{0} metriä" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Syötä käyttäjänimi" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps-piste" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Muokkaa viivanpiirtotyyliä" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Käytä globaaleja asetuksia." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Piirrä viivat pisteiden välillä tällä tasolla." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Viivanpiirtoasetukset" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8232,5 +8635,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8239,5 +8642,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8319,5 +8722,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Kuvaus" @@ -8349,10 +8752,10 @@ msgstr[1] "{0} reittipistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Muuta datatasoksi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8362,12 +8765,12 @@ "haitallisena.
Jos haluat lähettää jälkiä, katso:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8376,29 +8779,29 @@ msgstr "Muutettu jäljestä {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Lataa kaikki alueella:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} metriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Yhden pyynnön enimmäisalue:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} neliökilometriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8407,9 +8810,9 @@ msgstr "Tämä vaatii {0} erillistä latauspyyntöä.
Jatketaanko?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8417,5 +8820,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8423,23 +8826,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datataso {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "ladatun alueen ulkopuolella" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8448,5 +8851,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8460,5 +8863,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8471,11 +8874,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8484,36 +8887,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} koostuu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Muuta GPX-tasoksi" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8523,5 +8926,5 @@ "
If you want to upload traces, look here:" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8530,5 +8933,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8536,5 +8939,5 @@ msgstr[1] "pisteet" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8543,5 +8946,5 @@ msgstr[1] "jälki, jossa on {0} pistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8550,5 +8953,5 @@ msgstr[1] "{0}:ssä on {1} jälkeä" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8557,24 +8960,24 @@ msgstr[1] "{0} pistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Virhe tulkittaessa {0}:aa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Ei voitu lukea \"{0}\":aa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8585,34 +8988,34 @@ "kuva.
Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Kuvausaika (kuvan EXIF-tiedoista):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "GPS:n aika (lue ylläolevasta kuvasta): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [pp/kk/vvvv tt:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Ei päivämäärää" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Avaa toinen kuva" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8622,69 +9025,156 @@ "Ole hyvä ja syötä aika pyydetyssä muodossa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Virheellinen päivämäärä" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX-jälki: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Avaa toinen GPX-jälki" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +msgid "Override position for: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Aikavyöhyke: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Kaikki kuvat" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Ei mitään valittuna!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Kohdista kuvia GPX-jälkeen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Virheellinen aikavyöhyke" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Jäljitetään" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "Valitse GPX-jälki" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "GPX-jälkeä ei valittuna" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8693,9 +9183,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Virheellinen aikavyöhyke" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8704,135 +9190,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX-jälki ladattu" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Tutkii hakemistoa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Luetaan kuvia..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Luetaan {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Tutkii hakemistoa {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Geo-merkityt kuvat" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Sijoittele GPX-tiedoston mukaisesti" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8840,52 +9247,100 @@ msgstr[1] "kuvat" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} kuvasta löytyi gps-sijaintitiedot." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Siirrä aina, äläkä näytä tätä kysymystä enää" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Tiedostoa ei löytynyt." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Ei kuvaa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Ladataan {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Virhe tiedostossa {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Näytä geo-merkityt kuvat" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Edellinen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Edellinen kuva" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Vaihda: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Poista kuva tasosta" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Poista relaatiosta" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Seuraava" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Seuraava kuva" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Keskitä näkymä" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8896,5 +9351,5 @@ "Korkeus: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8991,4 +9446,12 @@ msgid "Error displaying URL" msgstr "Virhe näytettäessä URL:ia" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9203,7 +9666,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "" @@ -9272,6 +9734,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Polkupyörä" @@ -9666,31 +10128,90 @@ msgstr "Projektiota {0} ei voitu aktivoida. Käytetään Mercatoria" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Käytä välityspalvelinta" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonyymi" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Hostelli" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Portti:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Salasana" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Välityspalvelinasetukset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Välityspalvelimen osoite" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Välityspalvelimen portti" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Välityspalvelimen käyttäjänimi" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Välityspalvelimen salasana" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Karttatietokantapalvelun URL" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM-salasana" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9982,5 +10503,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9990,13 +10511,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10004,18 +10525,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Lisäominaisuudet:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Tuntematon tyyppi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10026,16 +10547,16 @@ msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Virhe käsiteltäessä {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10044,18 +10565,18 @@ msgstr[1] "Muuta {0} objektia" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Ei mitään valittuna!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Valinta ei ole sopiva!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Muuta ominaisuuksia" @@ -10084,4 +10605,11 @@ msgstr "Ladataan pisteet {0}-{1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10097,12 +10625,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "Null-osoitinpoikkeus, mahdollisesti puuttuvia tageja." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Valmistellaan karttatietoja..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10205,16 +10788,16 @@ msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen." -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10224,40 +10807,40 @@ msgstr "Ladataan OSM-karttatietoja..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10265,10 +10848,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Ladataan pisteet {0}-{1}..." -msgstr[1] "Ladataan pisteet {0}-{1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10305,14 +10888,14 @@ msgstr "NMEA-tuonti epäonnistui" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10321,16 +10904,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10338,66 +10921,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "Muutoskokoelmaa luodaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Muutoskokoelma {0} avattiin onnistuneesti" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Muutoskokoelmaa päivitetään..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "Muutoskokoelmaa {0} päivitetään..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Muutoskokoelmaa suljetaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Valmistellaan..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Lähetetään..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Valmistellaan karttatietoja..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Lähetetään {0} objektia..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10423,4 +11017,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10432,5 +11036,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10457,5 +11061,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10463,5 +11067,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10474,5 +11078,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10483,57 +11087,6 @@ msgstr "Muutoskokoelmalistaa käsitellään..." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Virheellinen salasana tai käyttäjänimi." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Varoitus: salasana lähetetään salaamattomana." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Anna salasana" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Kirjaudu sisään" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Karttatietokantapalvelun URL" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM-salasana" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10623,5 +11176,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10630,38 +11190,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10669,19 +11229,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Virheellinen objekti (id=0)" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10691,8 +11251,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10702,25 +11262,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10728,5 +11304,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10735,5 +11311,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10741,5 +11317,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10748,13 +11324,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Valmistellaan OSM-karttatietoja..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10777,20 +11353,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "Luetaan muutoskokoelmia..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "Ladataan muutoskokoelmia..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "Muutoskokoelmaa {0} luetaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." +msgstr "Muutoskokoelmaa {0} ladataan..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Ladataan muutoskokoelmia..." +msgstr[1] "Ladataan muutoskokoelmia..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." msgstr "Muutoskokoelmaa {0} ladataan..." @@ -10819,9 +11407,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10880,5 +11464,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10888,4 +11472,8 @@ msgid "Uploading data ..." msgstr "Lähetetään dataa..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +msgid "Unexpected id 0 for osm primitive found" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10927,12 +11515,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Poista {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Virhe poistettaessa liitännäistiedostoa: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11074,9 +11662,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "kuvausta ei ole saatavilla" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11208,4 +11796,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11495,6 +12098,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Lähetä jäljet" @@ -11580,5 +12183,5 @@ msgstr "Lähetetään GPX-jälkeä" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Lähettää jäljet openstreetmap.org:iin" @@ -11589,5 +12192,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Talonumeroiden interpolointilinja" @@ -11602,11 +12205,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11623,17 +12223,14 @@ #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "kivihiili" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "kuva" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Vuokraamo" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11763,5 +12360,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11823,21 +12420,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11846,13 +12443,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11877,17 +12474,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11899,18 +12496,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "Ranskan kiinteistörekisteri-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11918,5 +12515,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11924,52 +12521,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12171,5 +12765,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12360,5 +12954,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Ei dataa ladattuna." @@ -12380,9 +12974,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12768,7 +13362,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "vesi" @@ -12927,19 +13521,19 @@ msgstr "Kuvaa ei voitu ladata" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Yhdistetään" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Yhdistetty" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Yhteys epäonnistui" @@ -12978,32 +13572,32 @@ msgstr "LiveGPS-taso" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "Kytkeydy gpsd-palvelimeen ja näytä nykyinen sijainti LiveGPS-tasossa." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Keskitä LiveGPS-taso nykyiseen sijaintiin." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Keskitä LiveGPS-taso jatkuvasti nykyiseen sijaintiin." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13054,9 +13648,9 @@ msgstr "Ei voida piirtää maailman ulkopuolelle." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "mittaustila" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Mittaukset" @@ -13094,5 +13688,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13103,13 +13697,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13256,5 +13850,5 @@ msgstr "" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13348,5 +13942,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13422,41 +14016,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13625,4 +14219,41 @@ msgstr "Tagien esiasetuslähteet täytyy määritellä ensin asetuksissa." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Tiet" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +msgid " is not a number" +msgstr "" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13641,41 +14272,19 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Kadunnimi" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" msgstr "" @@ -13691,5 +14300,5 @@ msgstr "Ei virheitä" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Ruudukko" @@ -14356,38 +14965,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "rakennus" @@ -14401,5 +14980,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "alue" @@ -14518,10 +15097,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15223,6 +15802,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Numero" @@ -15668,5 +16247,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "" @@ -15784,5 +16363,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15794,5 +16373,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "metsä" @@ -16050,4 +16629,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16079,8 +16661,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "kyllä" @@ -16228,9 +16812,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "ei" @@ -16475,5 +17060,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "asuinkatu" @@ -16508,5 +17093,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "" @@ -16540,6 +17125,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "" @@ -16589,5 +17174,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "kiertoliittymä" @@ -16775,6 +17360,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "" @@ -16895,5 +17480,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16919,4 +17503,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16926,15 +17511,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operaattori" @@ -17146,7 +17731,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "" @@ -17565,5 +18150,5 @@ msgstr "räme" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17573,5 +18158,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "suo" @@ -18097,32 +18682,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Aukioloajat" @@ -18181,91 +18766,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18280,5 +18865,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18297,7 +18882,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "" @@ -18313,5 +18898,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "maanalainen" @@ -18324,6 +18909,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Maksu" @@ -18362,22 +18947,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Kauppa" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Muokkaa autokaupan ominaisuuksia" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Korjaamo" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Muokkaa autokorjaamon ominaisuuksia" @@ -18385,5 +18958,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Vuokraamo" @@ -18392,10 +18965,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Muokkaa autovuokraamon ominaisuuksia" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "" @@ -18403,5 +18976,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "" @@ -18409,10 +18982,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Muokkaa pyörätelineen ominaisuuksia" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Paikkojen lukumäärä" @@ -18421,22 +18994,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Pyöräkauppa" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Julkinen liikenne" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18446,5 +19012,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18452,5 +19018,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18458,5 +19024,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Rautatien seisake" @@ -18464,5 +19030,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Muokkaa rautatien seisaketta" @@ -18470,5 +19036,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Raitiovaunupysäkki" @@ -18477,5 +19043,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Muokkaa raitiovaunupysäkkiä" @@ -18483,5 +19049,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Asemalaituri" @@ -18490,5 +19056,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Muokkaa laiturin asetuksia" @@ -18500,5 +19066,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18506,10 +19072,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Alue" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Metron sisäänkäynti" @@ -18518,10 +19084,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Muokkaa sisäänkäynnin ominaisuuksia" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Pyörätuoli" @@ -18530,5 +19096,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Linja-autoasema" @@ -18537,5 +19103,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Muokkaa linja-autoaseman ominaisuuksia" @@ -18543,5 +19109,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Linja-autopysäkki" @@ -18551,5 +19117,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Muokkaa linja-autopysäkin ominaisuuksia" @@ -18558,17 +19124,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Penkki" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "" @@ -18576,5 +19150,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taksi" @@ -18582,5 +19156,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Muokkaa taksitolppaa" @@ -18588,5 +19162,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Lentokenttä" @@ -18594,15 +19168,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18610,10 +19184,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Majoittuminen" @@ -18625,5 +19199,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotelli" @@ -18632,15 +19206,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Muokkaa hotellia" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Tähdet" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motelli" @@ -18648,20 +19222,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Muokkaa motellin ominaisuuksia" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Vierasmaja" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Muokkaa vierasmajan ominaisuuksia" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Alppimaja" @@ -18669,10 +19243,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Hostelli" @@ -18680,30 +19254,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Matkailuvaunualue" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Muokkaa matkailuvaunualueen ominaisuuksia" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Leirintäalue" @@ -18711,10 +19285,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Ruoka ja juoma" @@ -18725,5 +19299,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Ravintola" @@ -18731,5 +19305,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Muokkaa ravintolan ominaisuuksia" @@ -18737,5 +19311,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "" @@ -18743,61 +19317,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italialainen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "kiinalainen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hampurilainen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "kreikkalainen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "saksalainen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "intialainen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "paikallinen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turkkilainen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "aasialainen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thaimaalainen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "meksikolainen" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japanilainen" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Pikaruoka" @@ -18805,9 +19379,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Muokkaa pikaruokalan ominaisuuksia" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Kahvila" @@ -18815,9 +19389,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Muokkaa kahvilan ominaisuuksia" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "" @@ -18825,18 +19399,18 @@ #. item "Food+Drinks/Pub" #. +#: build/trans_presets.java:1644 +msgid "Edit Pub" +msgstr "" + +#: build/trans_presets.java:1649 +msgid "Biergarten" +msgstr "" + +#. item "Food+Drinks/Biergarten" +#: build/trans_presets.java:1650 +msgid "Edit Biergarten" +msgstr "" + #: build/trans_presets.java:1655 -msgid "Edit Pub" -msgstr "" - -#: build/trans_presets.java:1660 -msgid "Biergarten" -msgstr "" - -#. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 -msgid "Edit Biergarten" -msgstr "" - -#: build/trans_presets.java:1666 msgid "Bar" msgstr "" @@ -18844,9 +19418,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Yökerho" @@ -18854,24 +19428,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Muokkaa yökerhon ominaisuuksia" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turismi" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Nähtävyys" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museo" @@ -18879,9 +19453,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Muokkaa museon ominaisuuksia" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Eläintarha" @@ -18890,9 +19464,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Muokkaa eläintarhan ominaisuuksia" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Näköalapaikka" @@ -18900,24 +19474,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Muokkaa näköalapaikan ominaisuuksia" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Teemapuisto" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Taideteos" @@ -18925,5 +19499,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "" @@ -18931,19 +19505,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Kartta" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18981,5 +19555,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18987,28 +19561,28 @@ msgstr "" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -19018,5 +19592,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -19024,6 +19598,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Pyöräily" @@ -19031,5 +19605,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19037,6 +19611,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "" @@ -19044,5 +19618,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19050,46 +19624,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "historia" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19097,29 +19671,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "" @@ -19127,25 +19701,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Piknik-paikka" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Muokkaa piknik-paikan ominaisuuksia" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Historialliset paikat" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Linna" @@ -19154,19 +19728,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Muokkaa linnan ominaisuuksia" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Rauniot" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Muokkaa raunioiden ominaisuuksia" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Arkeologinen kaivaus" @@ -19175,9 +19749,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Taistelukenttä" @@ -19185,10 +19759,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19196,5 +19770,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19202,15 +19776,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monumentti" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Muistomerkki" @@ -19218,55 +19792,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 msgid "Leisure" msgstr "Vapaa-ajanviete" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Vesipuisto" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Muokkaa vesipuiston ominaisuuksia" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Leikkipuisto" @@ -19274,35 +19848,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Muokkaa leikkipuiston ominaisuuksia" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Kalastus" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Muokkaa stadionin ominaisuuksia" @@ -19316,6 +19890,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "Valitse urheilulaji:" @@ -19707,30 +20281,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "urheilu" @@ -19740,225 +20314,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "jousiammunta" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "australialainen jalkapallo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "koripallo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "kuulapelit" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "kiipeily" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "kriketti" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "krikettiverkko" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "kroketti" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "pyöräily" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "ratsastus" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "amerikkalainen jalkapallo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "voimistelu" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "jääkiekko" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "ammunta" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "jalkapallo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "uinti" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "pöytätennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Urheilukeskus" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Muokkaa urheilukeskuksen ominaisuuksia" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Kenttä" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Muokkaa kentän ominaisuuksia" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Kilparata" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Muokkaa kilparadan ominaisuuksia" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfkenttä" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Muokkaa golf-kentän ominaisuuksia" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Pienoisgolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Muokkaa minigolfin ominaisuuksia" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Urheilu" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -19997,21 +20571,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "tyyppi" @@ -20050,203 +20624,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "kenttä" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "urheilukeskus" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" +#: build/trans_presets.java:1942 +msgid "Edit 10pin" +msgstr "" + +#: build/trans_presets.java:1947 +msgid "Athletics" +msgstr "" + +#. item "Sport/Athletics" +#: build/trans_presets.java:1948 +msgid "Edit Athletics" +msgstr "" + #: build/trans_presets.java:1953 -msgid "Edit 10pin" -msgstr "" - -#: build/trans_presets.java:1958 -msgid "Athletics" -msgstr "" - -#. item "Sport/Athletics" -#: build/trans_presets.java:1959 -msgid "Edit Athletics" -msgstr "" - -#: build/trans_presets.java:1964 msgid "Archery" msgstr "Jousiammunta" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Kiipeily" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" +#: build/trans_presets.java:1966 +msgid "Edit Canoeing" +msgstr "" + +#. item "Sport/Cycling" +#: build/trans_presets.java:1972 +msgid "Edit Cycling" +msgstr "" + #: build/trans_presets.java:1977 -msgid "Edit Canoeing" -msgstr "" - -#. item "Sport/Cycling" +msgid "Dog Racing" +msgstr "" + +#. item "Sport/Dog Racing" +#: build/trans_presets.java:1978 +msgid "Edit Dog Racing" +msgstr "" + #: build/trans_presets.java:1983 -msgid "Edit Cycling" -msgstr "" - -#: build/trans_presets.java:1988 -msgid "Dog Racing" -msgstr "" - -#. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 -msgid "Edit Dog Racing" -msgstr "" - -#: build/trans_presets.java:1994 msgid "Equestrian" msgstr "Ratsastus" #. item "Sport/Equestrian" +#: build/trans_presets.java:1984 +msgid "Edit Equestrian" +msgstr "" + +#: build/trans_presets.java:1989 +msgid "Horse Racing" +msgstr "" + +#. item "Sport/Horse Racing" +#: build/trans_presets.java:1990 +msgid "Edit Horse Racing" +msgstr "" + #: build/trans_presets.java:1995 -msgid "Edit Equestrian" -msgstr "" - -#: build/trans_presets.java:2000 -msgid "Horse Racing" -msgstr "" - -#. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 -msgid "Edit Horse Racing" -msgstr "" - -#: build/trans_presets.java:2006 msgid "Gymnastics" msgstr "Voimistelu" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Moottoriurheilu" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Muokkaa moottoriurheilun ominaisuuksia" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "" #. item "Sport/Skating" +#: build/trans_presets.java:2008 +msgid "Edit Skating" +msgstr "" + +#: build/trans_presets.java:2013 +msgid "Skateboard" +msgstr "" + +#. item "Sport/Skateboard" +#: build/trans_presets.java:2014 +msgid "Edit Skateboard" +msgstr "" + #: build/trans_presets.java:2019 -msgid "Edit Skating" -msgstr "" - -#: build/trans_presets.java:2024 -msgid "Skateboard" -msgstr "" - -#. item "Sport/Skateboard" -#: build/trans_presets.java:2025 -msgid "Edit Skateboard" -msgstr "" - -#: build/trans_presets.java:2030 msgid "Swimming" msgstr "Unti" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "" @@ -20254,56 +20828,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Ammunta" @@ -20311,182 +20885,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Pallopelit" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Jalkapallo" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Amerikkalainen jalkapallo" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Australialainen jalkapallo" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Koripallo" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golfkenttä" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Kuulapeli" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Muokkaa kuulapelin ominaisuuksia" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Kriketti" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Muokkaa kriketin ominaisuuksia" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Krikettiverkko" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Muokkaa krikettiverkon ominaisuuksia" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Kroketti" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Jääkiekko" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Muokkaa jääkiekkopaikan ominaisuuksia" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + +#: build/trans_presets.java:2121 +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Pöytätennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Rakennukset" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Rakennus" @@ -20494,5 +21068,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Julkinen rakennus" @@ -20500,10 +21074,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Muokkaa julkisen rakennuksen ominaisuuksia" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Kaupungintalo" @@ -20511,10 +21085,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Muokkaa kaupungintalon ominaisuuksia" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Suurlähetystö" @@ -20522,10 +21096,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Muokkaa suurlähetystön ominaisuuksia" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Oikeustalo" @@ -20534,10 +21108,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Muokkaa oikeustalon ominaisuuksia" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Vankila" @@ -20546,10 +21120,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Muokkaa vankilan ominaisuuksia" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Poliisiasema" @@ -20559,10 +21133,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Muokkaa poliisiaseman ominaisuuksia" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Paloasema" @@ -20571,10 +21145,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Muokkaa paloaseman ominaisuuksia" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Postitoimisto" @@ -20582,5 +21156,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Muokkaa postitoimiston ominaisuuksia" @@ -20588,15 +21162,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Lastentarha" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Muokkaa lastentarhan ominaisuuksia" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Koulu" @@ -20604,10 +21178,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Muokkaa koulun ominaisuuksia" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Yliopisto" @@ -20615,10 +21189,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Muokkaa yliopiston ominaisuuksia" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Korkeakoulu" @@ -20626,5 +21200,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Muokkaa korkeakoulun ominaisuuksia" @@ -20632,5 +21206,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Elokuvateatteri" @@ -20639,10 +21213,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Muokkaa elokuvateatterin ominaisuuksia" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Kirjasto" @@ -20651,9 +21225,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Muokkaa kirjaston ominaisuuksia" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Taidekeskus" @@ -20661,10 +21235,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Muokkaa taidekeskuksen ominaisuuksia" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Teatteri" @@ -20673,10 +21247,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Muokkaa teatterin ominaisuuksia" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "" @@ -20686,5 +21260,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "" @@ -20693,6 +21267,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Uskonto" @@ -20701,66 +21275,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "" @@ -20769,81 +21343,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Osoitteet" @@ -20852,5 +21426,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Muokkaa osoitetietoja" @@ -20858,5 +21432,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Talon numero" @@ -20864,20 +21438,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Talon nimi" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Kadunnimi" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Kaupungin nimi" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Postinumero" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Maakoodi" @@ -20886,5 +21465,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Muokkaa interpolointilinjaa" @@ -20892,61 +21471,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "pariton" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "parillinen" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Tehdas" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Muokkaa tehtaan ominaisuuksia" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Torni" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Muokkaa tornin ominaisuuksia" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20954,25 +21533,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Vesitorni" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Muokkaa vesitornin ominaisuuksia" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Kaasukello" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Muokkaa kaasukellon ominaisuuksia" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Majakka" @@ -20980,10 +21559,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Muokkaa majakan ominaisuuksia" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Tuulimylly" @@ -20991,10 +21570,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Muokkaa tuulimyllyn ominaisuuksia" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Putki" @@ -21003,37 +21582,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Muokkaa putken ominaisuuksia" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "kaasu" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Vedenpuhdistuslaitos" @@ -21043,10 +21622,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Nosturi" @@ -21054,10 +21633,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Muokkaa nosturin ominaisuuksia" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Loisto" @@ -21065,10 +21644,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "" @@ -21076,10 +21655,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Valvontakamera" @@ -21087,5 +21666,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Muokkaa valvontakameran ominaisuuksia" @@ -21093,5 +21672,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "" @@ -21101,35 +21680,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "tuuli" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "vesivoima" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fossiilinen polttoaine" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "ydinvoima" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "kivihiili" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "" @@ -21138,10 +21717,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Muuntamoasema" @@ -21150,5 +21729,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Muokkaa muuntamoaseman ominaisuuksia" @@ -21156,10 +21735,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Korkeajännitelinjan torni" @@ -21170,23 +21749,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Sähkölinja" @@ -21195,75 +21774,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Muokkaa sähkölinjan ominaisuuksia" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Jännite" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Käymälä" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Postilaatikko" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Puhelin" @@ -21272,5 +21851,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Muokkaa puhelimen ominaisuuksia" @@ -21278,5 +21857,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Kolikot" @@ -21284,5 +21863,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "" @@ -21290,5 +21869,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21296,5 +21875,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "" @@ -21302,15 +21881,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Luottokortit" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Puhelinkortit" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Kierrätys" @@ -21319,5 +21898,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Muokkaa kierrätyspisteen ominaisuuksia" @@ -21325,68 +21904,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Paristot" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Peltitölkit" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Vaatteet" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Lasi" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Paperi" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Romumetalli" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Penkki" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21457,39 +22031,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Metsästyslava" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Muokkaa metsästyslavan ominaisuuksia" @@ -21498,30 +22072,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Korkeus" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "täysi" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Lähde" @@ -21530,10 +22104,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Muokkaa lähteen ominaisuuksia" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Juomavesi" @@ -21542,10 +22116,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Muokkaa juomaveden ominaisuuksia" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21553,33 +22127,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Kaupat" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Muokkaa autokaupan ominaisuuksia" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Pyöräkauppa" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Lähikauppa" @@ -21587,9 +22185,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Muokkaa lähikaupan tietoja" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kioski" @@ -21597,27 +22195,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Muokkaa kioskin ominaisuuksia" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Automaatti" @@ -21625,5 +22223,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Muokkaa automaatin tietoja" @@ -21631,88 +22229,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Automaatin tuotteet" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "juomat" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Lihakauppa" @@ -21720,9 +22318,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Muokkaa lihakaupan ominaisuuksia" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Leipomo" @@ -21730,9 +22328,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Muokkaa leipomon ominaisuuksia" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "" @@ -21740,18 +22338,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Luomukauppa" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Muokkaa luomukaupan ominaisuuksia" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21759,54 +22357,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "" @@ -21814,9 +22412,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21824,9 +22422,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Tee-se-itse-kauppa" @@ -21834,54 +22432,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Kampaamo" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Muokkaa kampaamon ominaisuuksia" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Kuivapesula" @@ -21889,9 +22487,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Muokkaa kuivapesulan ominaisuuksia" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Pesula" @@ -21899,9 +22497,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Muokkaa pesulan ominaisuuksia" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "" @@ -21909,28 +22507,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Muokkaa optikon ominaisuuksia" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Raha" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Pankki" @@ -21938,14 +22536,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Muokkaa pankin ominaisuuksia" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Pankkiautomaatti" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Rahanvaihto" @@ -21953,5 +22551,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Muokkaa rahanvaihdon ominaisuuksia" @@ -21959,15 +22557,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Muokkaa pankkiautomaatin ominaisuuksia" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Terveys" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Lääkäri" @@ -21975,18 +22573,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Muokkaa lääkärin ominaisuuksia" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Hammaslääkäri" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Muokkaa hammaslääkärin ominaisuuksia" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Apteekki" @@ -21994,5 +22592,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Muokkaa apteekin ominaisuuksia" @@ -22000,9 +22598,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Sairaala" @@ -22010,10 +22608,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Muokkaa sairaalan ominaisuuksia" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -22022,5 +22620,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -22029,20 +22627,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Puhelinnumero" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -22050,5 +22648,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Eläinlääkäri" @@ -22057,64 +22655,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Muokkaa eläinlääkärin ominaisuuksia" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Paikat" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Maanosa" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Muokkaa maanosan ominaisuuksia" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Maa" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Muokkaa maan ominaisuuksia" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Osavaltio" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Muokkaa osavaltion ominaisuuksia" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Seutu" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "" @@ -22122,15 +22720,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Iso kaupunki" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Muokkaa kaupungin ominaisuuksia" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Kaupunki" @@ -22138,10 +22736,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Muokkaa kaupungin ominaisuuksia" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Kaupunginosa" @@ -22149,25 +22747,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Muokkaa kaupunginosan ominaisuuksia" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Kunta" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Muokkaa kunnan ominaisuuksia" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Kylä" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Muokkaa kylän ominaisuuksia" @@ -22175,5 +22773,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "" @@ -22181,10 +22779,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Saari" @@ -22192,10 +22790,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Muokkaa saaren ominaisuuksia" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22203,5 +22801,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22209,5 +22807,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Luolan suuaukko" @@ -22215,10 +22813,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Muokkaa luolan suuaukon ominaisuuksia" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Huippu" @@ -22226,10 +22824,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Muokkaa huipun ominaisuuksia" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Jäätikkö" @@ -22237,10 +22835,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Muokkaa jäätikön ominaisuuksia" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Tulivuori" @@ -22248,70 +22846,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Muokkaa tulivuoren ominaisuuksia" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Rajat" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Kansallinen" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Muokkaa kansallisen rajan ominaisuuksia" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Hallinnollinen" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Muokkaa hallinnollisen rajan ominaisuuksia" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Muokkaa poliittisen rajan ominaisuuksia" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Muokkaa kansallispuiston rajan ominaisuuksia" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Maankäyttö" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Puu" @@ -22320,15 +22918,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Muokkaa puun ominaisuuksia" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Kasvitieteellinen nimi" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Metsä" @@ -22337,5 +22935,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Muokkaa metsän ominaisuuksia" @@ -22343,17 +22941,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "havumetsä" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "lehtimetsä" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "sekametsä" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Talousmetsä" @@ -22362,14 +22960,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Muokkaa talousmetsän ominaisuuksia" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Luonnonsuojelualue" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "" @@ -22377,25 +22975,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Kivikko, rakka" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Muokkaa kivikon ominaisuuksia" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Pusikko" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Muokkaa pusikon ominaisuuksia" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Tunturi" @@ -22403,10 +23001,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Muokkaa tunturin ominaisuuksia" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Nummi" @@ -22414,5 +23012,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Muokkaa nummen ominaisuuksia" @@ -22420,5 +23018,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)" @@ -22427,45 +23025,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Muokkaa maatilan pihan ominaisuuksia" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Peltoalueet" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Viinitarha" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Muokkaa viinitarhan ominaisuuksia" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Siirtolapuutarha" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Muokkaa siirtolapuutarhan ominaisuuksia" @@ -22473,25 +23071,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Puutarha" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Ruoho" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Muokkaa ruohon ominaisuuksia" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22499,10 +23097,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22510,20 +23108,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Puisto" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Muokkaa puiston ominaisuuksia" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "" @@ -22531,5 +23129,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -22537,15 +23135,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Asuinalue" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Muokkaa asuinalueen ominaisuuksia" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Hautausmaa (pieni)" @@ -22553,9 +23151,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Muokkaa pienen hautausmaan ominaisuuksia" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Hautausmaa" @@ -22563,39 +23161,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Muokkaa hautausmaan ominaisuuksia" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Kaupallinen" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Muokkaa kaupallisen alueen ominaisuuksia" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Toimistoalue" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Muokkaa toimistoalueen ominaisuuksia" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Teollisuusalue" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Muokkaa teollisuusalueen ominaisuuksia" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Rata-alue" @@ -22603,15 +23201,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Muokkaa rata-alueen ominaisuuksia" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Sotilasvoimat" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia" @@ -22619,55 +23217,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Rakennustyömaa" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Muokkaa rakennustyömaan ominaisuuksia" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Purettuja rakennuksia" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Rakentamiselle raivattu alue" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Kaatopaikka" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Muokkaa kaatopaikan ominaisuuksia" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Louhos" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Muokkaa louhoksen ominaisuuksia" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "" @@ -22677,5 +23275,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "" @@ -22684,10 +23282,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "" @@ -22695,5 +23293,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22702,5 +23300,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22708,34 +23306,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Kielto" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "" @@ -22744,15 +23342,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "" @@ -22760,5 +23358,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22767,5 +23365,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22773,5 +23371,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22843,24 +23441,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "polkupyörä" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22913,5 +23511,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22920,13 +23518,13 @@ msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -22940,10 +23538,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -22951,31 +23549,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -22984,30 +23582,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23218,130 +23816,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23358,98 +23830,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "" @@ -23826,7 +24207,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23890,13 +24271,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23912,5 +24372,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23924,5 +24384,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23943,5 +24403,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "kääntöympyrä" @@ -23956,5 +24416,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23969,5 +24429,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "" @@ -23981,5 +24441,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "" @@ -23993,5 +24453,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "" @@ -24013,16 +24473,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24119,4 +24567,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24185,13 +24640,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24237,6 +24692,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24253,7 +24708,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24276,10 +24731,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24315,11 +24770,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24360,6 +24816,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24373,5 +24829,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminaali" @@ -24393,5 +24849,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24405,5 +24861,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24411,4 +24867,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24458,7 +24921,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "köysirata" @@ -24475,5 +24938,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24488,5 +24951,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24501,5 +24964,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24514,5 +24977,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24527,5 +24990,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24540,5 +25003,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24658,11 +25121,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "" @@ -24676,5 +25139,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "laituri" @@ -24688,5 +25151,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "" @@ -24814,12 +25277,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "" @@ -24833,5 +25313,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "" @@ -24869,4 +25349,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24885,4 +25381,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24903,8 +25407,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -25006,10 +25512,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25263,5 +25769,5 @@ #. #. -#. +#. #. color health #. @@ -25407,4 +25913,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25424,23 +25938,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25472,6 +25986,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25532,14 +26046,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25886,5 +26400,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25907,5 +26420,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "kauppa" @@ -25977,8 +26491,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotelli" @@ -26079,9 +26593,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turismi" @@ -26169,9 +26683,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "historiallinen" @@ -26185,5 +26699,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "louhos" @@ -26197,5 +26711,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "kaatopaikka" @@ -26217,5 +26731,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "valuma-alue" @@ -26229,5 +26743,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "talousmetsä" @@ -26241,5 +26755,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26262,5 +26776,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "" @@ -26274,5 +26788,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "" @@ -26286,5 +26800,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26298,5 +26812,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26310,5 +26824,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26365,7 +26879,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "" @@ -26379,5 +26893,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "hautausmaa" @@ -26390,5 +26904,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "huippu" @@ -26403,5 +26917,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "jäätikkö" @@ -26415,5 +26929,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "tulivuori" @@ -26468,8 +26982,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26483,5 +26997,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "pusikko" @@ -26495,5 +27009,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "nummi" @@ -26507,5 +27021,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26519,5 +27033,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "muta" @@ -26531,5 +27045,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "ranta" @@ -26607,8 +27121,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "reitti" @@ -26656,7 +27170,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "raja" @@ -26806,11 +27320,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "" @@ -26858,6 +27372,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "osoite" @@ -26887,5 +27401,5 @@ #: build/trans_surveyor.java:29 msgid "One Way" -msgstr "" +msgstr "Yksi Suunta" #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18839,7 +19417,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Numéro de référence" @@ -18855,5 +19433,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "souterrain" @@ -18866,6 +19444,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Péage/Forfait" @@ -18904,22 +19482,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Concession/Réparation" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Éditer une concession/réparation" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Réparer" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Editez un garagiste" @@ -18927,5 +19493,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Location" @@ -18934,10 +19500,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Éditer une location de voiture" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Partage" @@ -18945,5 +19511,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Éditer un covoiturage" @@ -18951,10 +19517,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Éditer un parking à vélo" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Capacité" @@ -18963,22 +19529,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Éditer une location de vélos" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Éditer un magasin de vélo" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Transport public" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18988,5 +19547,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18994,5 +19553,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "Référence UIC" @@ -19000,5 +19559,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Halte ferroviaire" @@ -19006,5 +19565,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Editez un arrêt" @@ -19012,5 +19571,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Arrêt de tram" @@ -19019,5 +19578,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Éditer un arrêt de tram" @@ -19025,5 +19584,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Quai" @@ -19032,5 +19591,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Éditer un quai" @@ -19042,5 +19601,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Référence (numéro de voie)" @@ -19048,10 +19607,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Surface" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Bouche de métro" @@ -19060,10 +19619,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Éditer une bouche de métro" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Chaise roulante" @@ -19072,5 +19631,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Gare routière" @@ -19079,5 +19638,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Éditer une gare routière" @@ -19085,5 +19644,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Arrêt de bus" @@ -19093,5 +19652,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Éditer un arrêt de bus" @@ -19100,17 +19659,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Abri" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Banc" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Plateforme de bus" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Éditer une plateforme de bus" @@ -19118,5 +19685,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -19124,5 +19691,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Editez une station de taxi" @@ -19130,5 +19697,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Aéroport" @@ -19136,15 +19703,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Modifier aéroport" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -19152,10 +19719,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Voyage" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Hôtel" @@ -19167,5 +19734,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hôtel" @@ -19174,15 +19741,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Éditer un hôtel" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Étoiles" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Môtel" @@ -19190,20 +19757,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Éditer un motel" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Chambre d’hôte" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Éditer une chambre d’hôte" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Châlet" @@ -19211,10 +19778,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Editez un châlet" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Hôtel" @@ -19222,30 +19789,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Éditer une auberge de jeunesse" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Chalet" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Modifier chalet" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Site pour caravane" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Éditer un site pour caravane" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Camping" @@ -19253,10 +19820,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Éditer un camping" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Nourriture & boissons" @@ -19267,5 +19834,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -19273,5 +19840,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Éditer un restaurant" @@ -19279,5 +19846,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Cuisine" @@ -19285,61 +19852,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italien" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "chinois" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "greque" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "allemand" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indien" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "régional" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turque" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asiatique" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thaïlandais" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexicain" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japonais" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Fast Food" @@ -19347,9 +19914,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Éditer un fast food" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Café" @@ -19357,9 +19924,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Editez un café" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Bar" @@ -19367,18 +19934,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Éditer un biergarten" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Bar" @@ -19386,9 +19953,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Modifier Bar" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Boîte de nuit" @@ -19396,24 +19963,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Éditer une boîte de nuit" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Tourisme" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Attraction" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Editez une attraction" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Musée" @@ -19421,9 +19988,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Éditer un musée" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -19432,9 +19999,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Editez un Zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Point de vue" @@ -19442,24 +20009,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Éditer un point de vue" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Tour de surveillance" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Parc d’attraction" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Éditer un parc d’attraction" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Oeuvre d’art" @@ -19467,5 +20034,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Éditer une oeuvre d’art" @@ -19473,19 +20040,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Office du Tourisme" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Carte" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -19523,5 +20090,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19529,28 +20096,28 @@ msgstr "rue" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "Schéma" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "Zone affichée" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "Site" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "Ville" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "Région" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Description détaillée" @@ -19560,5 +20127,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "Routes affichées pour :" @@ -19566,6 +20133,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Cyclisme" @@ -19573,5 +20140,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "VTT" @@ -19579,6 +20146,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Ski" @@ -19586,5 +20153,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "Equitation" @@ -19592,46 +20159,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" -msgstr "... autres modes de transport possibles" +msgstr "…autres modes de transport possibles" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Bureau d'informations" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "Contenu du panneau" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "Remarque" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "histoire" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "nature" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "faune" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "Usines" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "Poteau indicateur" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "Poste d'informations" @@ -19639,29 +20206,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "Description précise" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1769 msgid "Audioguide" msgstr "Guide audio" #. -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" msgstr "Guide audio via téléphone mobile ?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 +#: build/trans_presets.java:1780 msgid "Phone number" msgstr "Numéro de téléphone" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Autre points d'information" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Éditer un abri" @@ -19669,25 +20236,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Âtre" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Site de pique-nique" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Éditer un site de pique-nique" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Patrimoine" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Château" @@ -19696,19 +20263,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Éditer un château" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruines" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Éditer des ruines" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Site archéologique" @@ -19717,9 +20284,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Éditer un site archéologique" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Lieu de bataille" @@ -19727,10 +20294,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Éditer un lieu de bataille" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "Site paléontologique" @@ -19738,5 +20305,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "Éditer un site paléontologique" @@ -19744,15 +20311,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monument commémoratif" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Editez un monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Mémorial" @@ -19760,55 +20327,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Éditer un mémorial" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Croix" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Éditer une croix" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Chapelle" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Éditer une Chapelle" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "Pierre frontalière" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "Éditer Pierre frontalière" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Loisir" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Parc aquatique" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Éditer un parc aquatique" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Aire de jeux" @@ -19816,35 +20383,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Éditer une zone de jeu" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Pêche" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Éditer un lieu de pêche" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Sports" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Sport" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stade" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Éditer un stade" @@ -19858,6 +20425,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "Selectionner un sport:" @@ -20249,30 +20816,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "sport" @@ -20282,225 +20849,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "multi" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "tir à l'arc" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "athletics" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "australian_football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basketball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "boules" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "boules" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "canoë" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "climbing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "cricket_nets" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "croquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "cycling" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "dog_racing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "équitation" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gymnastics" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hockey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "horse_racing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "moteur" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelote" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "racquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "chasse" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "skate" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "ski" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "swimming" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "table_tennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Centre sportif" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Éditer un centre sportif" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Terrain de sport" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Éditer un terrain de sport" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Circuit" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Éditer un circuit" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Parcours de Golf" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Éditer un terrain de golf" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Éditer un minigolf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Multi" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Editer Multi" @@ -20539,21 +21106,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "type" @@ -20592,203 +21159,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "Terrain" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "sports_centre" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadium" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "№piste" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "Bowling" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Éditer un Bowling" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Athlétisme" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Éditer athlétisme" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Tir à l’arc" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Éditer tir à l’arc" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Escalade" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Éditer escalade" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Canoë" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Éditer canoë" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Éditer cyclisme" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Course de chiens" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Éditer course de chiens" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Equitation" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Éditer sports équestres" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Course de chevaux" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Éditer course de chevaux" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gymnastique" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Éditer gymnastique" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Sports mécaniques" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Éditer sports mécaniques" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Skate" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Éditer patin à roulettes" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Éditer skateboard" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Natation" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Éditer natation" @@ -20796,56 +21363,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "ski" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Type de piste" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "de descente" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "nordique" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "snow park" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Difficulté" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "verte" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "bleue" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "intermédiaire" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "avancé" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "expert" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "jaune" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Tirer" @@ -20853,182 +21420,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Éditer tir sportif" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Sport de balle" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Football" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Éditer football" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Football" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Éditer football" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Football australien" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Éditer football australien" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Éditer baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Éditer basketball" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Editer un Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golf_course" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boules" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Éditer boules" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Boules" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Éditer bowls" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Éditer cricket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Filets de cricket" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Éditer filets de cricket" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Éditer croquet" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Éditer hockey" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelote" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Éditer pelote basque" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Sports de raquette" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Éditer sports de raquette" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Éditer rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Tennis de table" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Éditer tennis de table" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Éditer tennis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "Artificiel" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Bâtiments" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Bâtiment" @@ -21036,5 +21603,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Bâtiment officiel" @@ -21042,10 +21609,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Éditer un bâtiment officiel" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Mairie" @@ -21053,10 +21620,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Éditer une mairie" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Ambassade" @@ -21064,10 +21631,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Editer une ambassade" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Palais de justice" @@ -21076,10 +21643,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Éditer un palais de justice" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Prison" @@ -21088,10 +21655,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Éditer une prison" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Poste de police" @@ -21101,10 +21668,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Éditer un poste de police" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Caserne de pompiers" @@ -21113,10 +21680,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Éditer une caserne de pompiers" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Bureau de poste" @@ -21124,5 +21691,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Éditer un bureau de poste" @@ -21130,15 +21697,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Jardin d’enfants" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Éditer un jardin d’enfants" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "École" @@ -21146,10 +21713,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Éditer une école" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Université" @@ -21157,10 +21724,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Éditer une université" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Établissement d’enseignement supérieur" @@ -21168,5 +21735,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Éditer un établissement d’enseignement supérieur" @@ -21174,5 +21741,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Cinema" @@ -21181,10 +21748,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Éditer un cinéma" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Bibliothèque" @@ -21193,9 +21760,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Éditer une bibliothèque" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Centre artistique" @@ -21203,10 +21770,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Éditer un centre artistique" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Théâtre" @@ -21215,10 +21782,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Éditer un théatre" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Lieu de culte" @@ -21228,5 +21795,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Éditer un lieu de culte" @@ -21235,6 +21802,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religion" @@ -21243,66 +21810,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "christian" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "jewish" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "unitarisme" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrian" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Dénomination" @@ -21311,81 +21878,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglican" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "catholique" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangelical" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "jehovahs_witness" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "lutheran" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "methodist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormon" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbyterian" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adresses" @@ -21394,5 +21961,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Editez l'adresse" @@ -21400,5 +21967,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Numéro du bâtiment" @@ -21406,20 +21973,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Nom de la maison" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Nom de la rue" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Nom de la ville" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Code postal" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Indicatif du pays" @@ -21428,5 +22000,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Éditer l’interpolation d’adresse" @@ -21434,61 +22006,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Schéma de numérotation" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "pair" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "impair" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "alphabétique" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Édifices" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Usine" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Éditer une usine" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Structure de hauteur" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Éditer une structure de hauteur" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "Type de pylône" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "communication" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "observation" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "Hauteur (mètres)" @@ -21496,25 +22068,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Château d’eau" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Éditer un château d’eau" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gazomètre" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Éditer un gazomètre" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Phare" @@ -21522,10 +22094,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Éditer un phare" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Moulin à vent" @@ -21533,10 +22105,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Éditer un moulin à vent" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Canalisation" @@ -21545,37 +22117,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Éditer une canalisation" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "pétrole" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gaz" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "égouts" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "chaleur" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "toute substance" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "sous l'eau" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "aérien" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Station d’épuration" @@ -21585,10 +22157,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Éditer une station d’épuration" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Grue" @@ -21596,10 +22168,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Éditer une grue permanente" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Balise signalétique" @@ -21607,10 +22179,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Editer balise signalétique" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Équipement de topographie" @@ -21618,10 +22190,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Éditer un équipement de topographie" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Surveillance" @@ -21629,5 +22201,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Éditer une caméra de surveillance" @@ -21635,5 +22207,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Centrale électrique" @@ -21643,35 +22215,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Éditer une centrale électrique" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "hydro" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "charbon" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "photovoltaïque" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Station électrique" @@ -21680,10 +22252,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Editez une station électrique" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Transformateur électrique" @@ -21692,5 +22264,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Modifier transformateur électrique" @@ -21698,10 +22270,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Champ de vision" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Pylône électrique" @@ -21712,23 +22284,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Éditer un pylône électrique" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "pylônes" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "Référence du pylône" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Ligne haute tension" @@ -21737,75 +22309,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Editer une ligne haute tension" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "Type de ligne" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "ligne" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "ligne mineure" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Tension" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "Nombre de câbles" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "Nombre de conducteurs par câbles" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "simple" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "double" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "triple" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "quadruple" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Équipements" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Toilettes" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Boîte aux lettres" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Téléphone" @@ -21814,5 +22386,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Éditer un téléphone" @@ -21820,5 +22392,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Pièces" @@ -21826,5 +22398,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Billets" @@ -21832,5 +22404,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Cartes de crédit temporaire" @@ -21838,5 +22410,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Cartes de débit" @@ -21844,15 +22416,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Cartes de crédits" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Cartes téléphoniques" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Recyclage" @@ -21861,5 +22433,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Éditer un point de recylcage" @@ -21867,68 +22439,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Canettes" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Vêtements" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Verre" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Ferrailleur" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Banc" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "Accoudoir" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "Matériau" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "pierre" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "plastique" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "Couleur" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "noir" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "marron" @@ -21999,39 +22566,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "espace vert" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "rouge" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "bleu" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "gris" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "blanc" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "Nombre de places" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Hutte de chasse" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Hutte de chasse" @@ -22040,30 +22607,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Hauteur" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "faible" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "à moitié" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "complet" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Masquer" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Verrouiller" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fontaine" @@ -22072,10 +22639,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Éditer une fontaine" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Eau potable" @@ -22084,10 +22651,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Éditer un point d’eau potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Tour d’abandon (nouveau né)" @@ -22095,33 +22662,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Éditer un tour d’abandon" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Magasins" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Éditer une concession/réparation" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Éditer un magasin de vélo" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarché" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Éditer un supermarché" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "Droguerie" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "Éditer la droguerie" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Commerce de proximité" @@ -22129,9 +22720,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Éditer une épicerie" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosque à journaux" @@ -22139,27 +22730,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Éditer un kiosque à journaux" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "Librairie" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "Éditer librairie" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Agence de voyage" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Éditer agence de voyage" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Distributeur automatique" @@ -22167,5 +22758,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Éditer un distributeur automatique" @@ -22173,88 +22764,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Produits vendus" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "food" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "bonbons" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "jouets" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Cartes de fidélité" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Boucherie" @@ -22262,9 +22853,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Éditer une boucherie" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Boulanger" @@ -22272,9 +22863,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Éditer une boulangerie" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Fleuriste" @@ -22282,18 +22873,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Modifier fleuriste" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Boutique bio" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Modifier boutique bio" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Alcool" @@ -22301,54 +22892,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Modifier commerce d'acool" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Boissons" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Modifier débit de boissons" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Informatique" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Modifier magasin informatique" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Électronique" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Modifier magasin d’électronique" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hi-Fi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Modifier boutique Hi-Fi" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Ameublement" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Modifier magasin d’ameublement" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Jardinerie" @@ -22356,9 +22947,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Modifier jardinerie" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Quincaillerie" @@ -22366,9 +22957,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Modifier quincaillerie" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Magasin de bricolage" @@ -22376,54 +22967,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Éditer un magasin de bricolage" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Papeterie" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Modifier papeterie" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Coiffeur" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Editez un Coiffeur" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Magasin de chaussures" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Modifier magasin de chaussures" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Jouets" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Modifier magasin de jouets" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Vidéoclub" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Modifier vidéoclub" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Pressing" @@ -22431,9 +23022,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Éditer un pressing" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Laverie libre-service" @@ -22441,9 +23032,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Éditer une laverie" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Magasin de sports d’extérieur" @@ -22451,28 +23042,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Éditer un magasin de sports d’extérieur" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Modifier magasin de sport" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Opticien" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Modifier opticien" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Argent" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banque" @@ -22480,14 +23071,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Editez une banque" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Distributeur automatique" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Bureau de change" @@ -22495,5 +23086,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Éditer un bureau de change" @@ -22501,15 +23092,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Éditer un distributeur automatique" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Santé" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Médecin" @@ -22517,18 +23108,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Modifier Médecin" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Dentiste" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Editez le Dentiste" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Pharmacie" @@ -22536,5 +23127,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Éditer pharmacie" @@ -22542,9 +23133,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Dispensaire" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Hôpital" @@ -22552,10 +23143,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Éditer hôpital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Point d’accès d’urgence" @@ -22564,5 +23155,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Éditer point d’accès d’urgence" @@ -22571,20 +23162,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Numéro du point" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Nom du point" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Numéro de téléphone" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Utiliser le code international, comme +12-345-67890" @@ -22592,5 +23183,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Vétérinaire" @@ -22599,64 +23190,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Editez un Vétérinaire" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "Géographie" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Lieux/endroits" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Continent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Éditer un continent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Pays" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Éditer un pays" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Département" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Éditer un état" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Région" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Éditer une région" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Comté/Canton" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Éditer un comté/canton" @@ -22664,15 +23255,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Ville de plus de 100 000 habitants" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Editez la ville" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Ville 10 000 à 100 000 habitants" @@ -22680,10 +23271,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Editez la ville" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Banlieue" @@ -22691,25 +23282,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Éditer une banlieue" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Village" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Éditer un village" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Hameau" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Éditer un hameau" @@ -22717,5 +23308,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Lieu-dit" @@ -22723,10 +23314,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Éditer un lieu-dit" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "île" @@ -22734,10 +23325,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Éditer une île" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "îlot" @@ -22745,5 +23336,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "Éditer l'îlot" @@ -22751,5 +23342,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Entrée de grotte" @@ -22757,10 +23348,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Éditer une entrée de grotte" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Sommet" @@ -22768,10 +23359,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Modifier un pic" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Glacier" @@ -22779,10 +23370,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Éditer un glacier" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Volcan" @@ -22790,70 +23381,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Éditer un volcan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Frontières" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Nationale" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Éditer une frontière nationale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administrative" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Éditer une frontière administrative" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Civile" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Éditer une frontière civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Politique" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Éditer une zone électorale" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Parc national" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Éditer les frontières d’un parc national" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Utilisation du terrain" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Arbre" @@ -22862,15 +23453,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Éditer un arbre isolé" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Nom botanique" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Bois" @@ -22879,5 +23470,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Éditer un bois" @@ -22885,17 +23476,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "coniferous" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Forêt" @@ -22904,14 +23495,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Éditer une forêt" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Réserve naturelle" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Éditer une réserve naturelle" @@ -22919,25 +23510,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Zone d’éboulements" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Éditer une zone d’éboulements" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Broussailles" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Éditer des broussailles" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Talus" @@ -22945,10 +23536,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Éditer un talus" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Lande" @@ -22956,5 +23547,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Éditer une lande" @@ -22962,5 +23553,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Bâtiments de ferme" @@ -22969,45 +23560,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Éditer des bâtiments de ferme" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Terrains de ferme" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Éditer des terrains de ferme" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Prairie" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Editer prairie" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vigne" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Éditer une vigne" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Jardins familiaux" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Éditer des jardins familiaux" @@ -23015,25 +23606,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Jardin" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Éditer un jardin" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Herbe" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Éditer de l’herbe" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Zone publique herborée" @@ -23041,10 +23632,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Éditer une zone publique herborée" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Espace commun" @@ -23052,20 +23643,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Éditer un espace commun" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Parc" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Editez un Parc" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Aire de jeux" @@ -23073,5 +23664,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Éditer une aire de jeux" @@ -23079,15 +23670,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Zone résidentielle" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Éditer une zone résidentielle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Petit cimetière" @@ -23095,9 +23686,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Éditer un petit cimetière" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Cimetière" @@ -23105,39 +23696,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Éditer un cimetière" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Zone commerciale" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Éditer une zone commerciale" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Bureaux" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Éditer des bureaux" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Zone industrielle" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Éditer une zone industrielle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Zone ferroviaire" @@ -23145,15 +23736,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Éditer une zone ferroviaire" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militaire" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Éditer un terrain militaire" @@ -23161,55 +23752,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Zone de construction" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Éditer un chantier" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Terrain en friche" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Éditer un terrain en friche" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Espace vert" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Éditer une nouvelle zone de construction" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Décharge" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Éditer une décharge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Carrière" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Éditer une carrière" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multypoligone" @@ -23219,5 +23810,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Modifier un multipolygone" @@ -23226,10 +23817,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "segment extérieur" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "segment intérieur" @@ -23237,5 +23828,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Interdiction de tourner" @@ -23244,5 +23835,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Modifier une interdiction de tourner" @@ -23250,34 +23841,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "Interdiction de tourner à gauche" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "Interdiction de tourner à droite" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "Interdiction d'aller tout droit" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "Interdiction de faire demi-tour" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "Obligation de tourner à droite" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "Obligation de tourner à gauche" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "Obligation d'aller tout droit" @@ -23286,15 +23877,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "chemin d'origine" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "nœud ou chemin de passage" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "chemin destination" @@ -23302,5 +23893,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Route" @@ -23309,5 +23900,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Modifier une route" @@ -23315,5 +23906,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Type de route" @@ -23385,24 +23976,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "vélo/bicyclette" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "route" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "ski" @@ -23455,5 +24046,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23462,13 +24053,13 @@ msgstr "piéton" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "randonnée" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "détour" @@ -23482,10 +24073,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "métro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Description du symbole" @@ -23493,31 +24084,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Réseau" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "État de la route" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "proposé" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "alternatif" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "temporaire" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "connexion" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Couleur (hexa)" @@ -23526,30 +24117,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "segment de route" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "segment suivant" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "segment précédent" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "point d'arrêt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "point d'arrêt suivant" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "point d'arrêt précédent" @@ -23760,130 +24351,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23900,98 +24365,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "déprécié" @@ -24368,7 +24742,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "piste" @@ -24432,13 +24806,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "voie ferrée" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24454,5 +24907,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "services" @@ -24466,5 +24919,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "gué" @@ -24485,5 +24938,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "zone de manœuvre" @@ -24498,5 +24951,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "accès d'urgence" @@ -24511,5 +24964,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "berge" @@ -24523,5 +24976,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "ruisseau" @@ -24535,5 +24988,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "dock" @@ -24555,16 +25008,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "aqueduc" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24661,4 +25102,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24727,13 +25175,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "artificiel" @@ -24779,6 +25227,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24795,7 +25243,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "point ferroviaire" @@ -24818,10 +25266,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "Autre voie ferrée" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "passage au dessus d'une voie ferrée" @@ -24857,11 +25305,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "ligne ferroviaire touristique" #. color rail +#. #. 1 #. 50000 @@ -24902,6 +25351,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "piste d'atterrissage" @@ -24915,5 +25364,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -24935,5 +25384,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "piste (sombre)" @@ -24947,5 +25396,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "piste (claire)" @@ -24953,4 +25402,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -25000,7 +25456,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "couloir aérien" @@ -25017,5 +25473,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "piste bleue" @@ -25030,5 +25486,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "piste rouge" @@ -25043,5 +25499,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "piste noire" @@ -25056,5 +25512,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "piste_orange" @@ -25069,5 +25525,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "hors piste" @@ -25082,5 +25538,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "piste verte" @@ -25200,11 +25656,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "alimentation électrique" @@ -25218,5 +25674,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "appontement/jetée" @@ -25230,5 +25686,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "canalisation" @@ -25356,12 +25812,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "loisir" @@ -25375,5 +25848,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "port" @@ -25411,4 +25884,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25427,4 +25916,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25445,8 +25942,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "aménité" @@ -25548,10 +26047,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "équipement de traffic" @@ -25805,5 +26304,5 @@ #. #. -#. +#. #. color health #. @@ -25949,4 +26448,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25966,23 +26473,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "équipement lumineux" @@ -26014,6 +26521,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "eau (claire)" @@ -26074,14 +26581,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "santé" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26428,5 +26935,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26449,5 +26955,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "magasin" @@ -26519,8 +27026,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hôtel" @@ -26621,9 +27128,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "tourisme" @@ -26711,9 +27218,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "patrimoine" @@ -26727,5 +27234,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "carrière" @@ -26739,5 +27246,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "décharge" @@ -26759,5 +27266,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "bassin" @@ -26771,5 +27278,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "forêt" @@ -26783,5 +27290,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "bâtiments de ferme" @@ -26804,5 +27311,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "commerce de proximité" @@ -26816,5 +27323,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "zone industrielle" @@ -26828,5 +27335,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "terrain en friche" @@ -26840,5 +27347,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "espace vert" @@ -26852,5 +27359,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "zone ferroviaire" @@ -26907,7 +27414,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "zone militaire" @@ -26921,5 +27428,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "cimetière" @@ -26932,5 +27439,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "sommet" @@ -26945,5 +27452,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "glacier" @@ -26957,5 +27464,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "volcan" @@ -27010,8 +27517,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "nature" @@ -27025,5 +27532,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "broussailles" @@ -27037,5 +27544,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "lande/bruyère" @@ -27049,5 +27556,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "Zone de forêt" @@ -27061,5 +27568,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "terrain boueux/vase" @@ -27073,5 +27580,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "plage" @@ -27149,8 +27656,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "route" @@ -27198,7 +27705,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "frontière" @@ -27348,11 +27855,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "lieu" @@ -27400,6 +27907,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adresse" @@ -27755,33 +28262,126 @@ msgstr "Sicile - Italie" +#~ msgid "Updating primitive" +#~ msgstr "Mise à jour des primitives" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Les parenthèses doivent être fermées." + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " -#~ "présent." - -#~ msgid "Download all incomplete ways and nodes in relation" +#~ "Le nombre actuel de changements dépasse le maximum autorisé. Nombre " +#~ "courant : {0}, maximum : {1}" + +#~ msgid "Use an open changeset" +#~ msgstr "Utiliser ensemble de changements ouvert" + +#~ msgid "" +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Télécharger tous les chemins et les nœuds incomplets dans la relation" - -#~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" +#~ "Je peux prendre un autre phot de mon GPS.
Cela peut-il aider ?" + +#~ msgid "All images" +#~ msgstr "Toutes les images" + +#~ msgid "Images with no exif position" +#~ msgstr "Images sans position EXIF" + +#~ msgid "Not yet tagged images" +#~ msgstr "Images non encore étiquetées" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Trouvé {0} correspondances sur {1} dans la trace GPX {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "Trace GPX chargée" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Différence entre la trace et les photos : {0}min. {1}sec." + +#~ msgid "Default Values" +#~ msgstr "Valeurs par défaut" + +#~ msgid "Enable proxy server" +#~ msgstr "Activer le serveur mandataire (proxy)" + +#~ msgid "Anonymous" +#~ msgstr "Anonyme" + +#~ msgid "Proxy server host" +#~ msgstr "Hôte du serveur mandataire" + +#~ msgid "Proxy server port" +#~ msgstr "Port du serveur mandataire" + +#~ msgid "Proxy server username" +#~ msgstr "Nom d’utilisateur du serveur mandataire" + +#~ msgid "Proxy server password" +#~ msgstr "Mot de passe du serveur mandataire" + +#~ msgid "NullPointerException, possibly some missing tags." #~ msgstr "" -#~ "Permettre l'envoi de tous les changements en une requête, désactivez pour " -#~ "utiliser une requête par primitive modifiée" - -#~ msgid "Images for {0}" -#~ msgstr "Images pour {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Lecture GPX..." +#~ "Échec (NullPointerException). Sans doute parce qu'il manque des attributs." + +#~ msgid "Preparing..." +#~ msgstr "Préparation en cours…" + +#~ msgid "Uploading..." +#~ msgstr "Envoi en cours…" + +#~ msgid "Incorrect password or username." +#~ msgstr "Mot de passe ou nom d’utilisateur incorrect." + +#~ msgid "Enter Password" +#~ msgstr "Entrer le mot de passe" + +#~ msgid "Login" +#~ msgstr "Identifiant" + +#~ msgid "Auto-tag source added:" +#~ msgstr "Ajouter le commentaire de source suivant :" + +#~ msgid "Interpolation" +#~ msgstr "Interpolation" + +#~ msgid "Optional" +#~ msgstr "Optionnel" + +#~ msgid "Shop" +#~ msgstr "Concession/Réparation" + +#~ msgid "aqueduct" +#~ msgstr "aqueduc" + +#~ msgid "Move" +#~ msgstr "Déplacer" + +#~ msgid "Data Layer" +#~ msgstr "Calque de données" + +#~ msgid "No data imported." +#~ msgstr "Aucune donnée importée" + +#~ msgid "Select a bookmark first." +#~ msgstr "Sélectionner un marque-page en premier." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Aucun document ouvert donc rien à sauvegarder." + +#~ msgid "Unknown file extension." +#~ msgstr "Extension de fichier inconnue." + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Résoudre les conflits" #~ msgid "No time for point {0} x {1}" #~ msgstr "Aucune heure pour le point {0}·x·{1}" -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}" - #~ msgid "No images with readable timestamps found." #~ msgstr "Aucune image avec des informations horaires lisibles trouvée." @@ -27793,7 +28393,4 @@ #~ msgstr "Extinction du GPS : {0}" -#~ msgid "current delta: {0}s" -#~ msgstr "variation différentielle actuelle : {0}s" - #~ msgid "timezone difference: " #~ msgstr "différence de fuseau horaire : " @@ -27802,83 +28399,6 @@ #~ msgstr "{0} dans la trace." -#~ msgid "Sync clock" -#~ msgstr "Synchroniser l’horloge" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." - #~ msgid "Image" #~ msgstr "Image" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Synchroniser l’heure avec l’instrument GPS" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "La date indiquée ne peut être analysée." - -#~ msgid "" -#~ "Loading of {0} plugin was requested. This plugin is no longer required." -#~ msgstr "" -#~ "Le chargement du greffon {0} a été demandé. Ce greffon n'est plus " -#~ "nécessaire." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Images géoétiquettées" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Ouvrir les images avec AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "options osmarender" - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "Un autre greffon de géo-marquage pour JOSM. Corrèle des photos avec des " -#~ "traces GPS, ou importe des photos géo-marquées." - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Quelques utilitaires qui vous rendent la vie plus facile : par ex. " -#~ "simplifier un chemin, joindre des aires, aller à une position." - -#~ msgid "Move" -#~ msgstr "Déplacer" - -#~ msgid "Data Layer" -#~ msgstr "Calque de données" - -#~ msgid "No data imported." -#~ msgstr "Aucune donnée importée" - -#~ msgid "Select a bookmark first." -#~ msgstr "Sélectionner un marque-page en premier." - -#~ msgid "File could not be found." -#~ msgstr "Impossible de trouver le fichier." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Aucun document ouvert donc rien à sauvegarder." - -#~ msgid "Unknown file extension." -#~ msgstr "Extension de fichier inconnue." - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Résoudre les conflits" #~ msgid "Object" @@ -27951,4 +28471,7 @@ #~ msgstr "Date" +#~ msgid "Images for {0}" +#~ msgstr "Images pour {0}" + #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -27966,4 +28489,7 @@ #~ msgid "requested: {0}" #~ msgstr "demandé : {0}" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Images géoétiquettées" #~ msgid "Metacarta Map Rectifier image id" @@ -28007,4 +28533,16 @@ #~ msgid "Tags (empty value deletes tag)" #~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}" + +#~ msgid "Sync clock" +#~ msgstr "Synchroniser l’horloge" + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)" #~ msgid "Error while parsing" @@ -28032,4 +28570,7 @@ #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" #~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :" + +#~ msgid "Read GPX..." +#~ msgstr "Lecture GPX..." #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -28081,4 +28622,10 @@ #~ msgid "zoom" #~ msgstr "zoom" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Ouvrir les images avec AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "options osmarender" #~ msgid "error requesting update" @@ -28226,4 +28773,8 @@ #~ msgstr "id du nœud mal formé" +#~ msgid "Download all incomplete ways and nodes in relation" +#~ msgstr "" +#~ "Télécharger tous les chemins et les nœuds incomplets dans la relation" + #~ msgid "" #~ "The selected nodes have differing relation memberships. Do you still " @@ -28452,4 +29003,19 @@ #~ msgstr "Fusionner les conflits." +#~ msgid "current delta: {0}s" +#~ msgstr "variation différentielle actuelle : {0}s" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchroniser l’heure avec l’instrument GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "La date indiquée ne peut être analysée." + #~ msgid "Login name (email) to the OSM account." #~ msgstr "Nom d’utilisateur (e-mail) du compte OSM." @@ -28570,4 +29136,11 @@ #~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Un autre greffon de géo-marquage pour JOSM. Corrèle des photos avec des " +#~ "traces GPS, ou importe des photos géo-marquées." + +#~ msgid "" #~ "Tools to work with authors/users. Selects map data that belongs to " #~ "selected user, opens browser showing selected author profile page." @@ -28576,4 +29149,11 @@ #~ "donnée de l'utilisateur sur la carte pour ouvrir un navigateur affichant " #~ "la page du profil de l'auteur." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Quelques utilitaires qui vous rendent la vie plus facile : par ex. " +#~ "simplifier un chemin, joindre des aires, aller à une position." #~ msgid "Directly load TCX files from JOSM." @@ -28666,7 +29246,4 @@ #~ msgid "Select a starting node on the end of a way" #~ msgstr "Sélectionner le nœud de départ à la fin d'un chemin" - -#~ msgid "Reached a junction" -#~ msgstr "Intersection atteinte" #~ msgid "Checking whether node {0} is gone ..." @@ -28858,4 +29435,11 @@ #~ msgstr "Téléchargement des référents depuis OSM..." +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Permettre l'envoi de tous les changements en une requête, désactivez pour " +#~ "utiliser une requête par primitive modifiée" + #~ msgid "Can't search because there is no loaded data." #~ msgstr "Impossible de rechercher car il n’y a pas de données chargées." @@ -28951,4 +29535,10 @@ #~ "HREF=\"{1}\">votre langage." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " +#~ "présent." + #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données" @@ -29000,10 +29590,4 @@ #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." -#~ msgstr "" -#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, " -#~ "reçu \"{1}\"" - -#~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " #~ "''{1}''." @@ -29014,2 +29598,8 @@ #~ msgid "No type found. History is empty." #~ msgstr "Pas de type trouvé. L'historique est vide." + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "Le chargement du greffon {0} a été demandé. Ce greffon n'est plus " +#~ "nécessaire." Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 19198) +++ /applications/editors/josm/i18n/po/gl.po (revision 19199) @@ -4,9 +4,10 @@ # FIRST AUTHOR , 2009. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" "PO-Revision-Date: 2009-09-22 15:04+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Creando Interface (GUI) principal" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Axuda" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de ficheiro mal formada: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "Acerca de JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -277,5 +279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -284,5 +286,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -291,15 +293,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -308,29 +315,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -347,5 +355,9 @@ msgstr "Cancelar" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -361,5 +373,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "" @@ -377,15 +389,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Engadir Nodo..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Engadir un nodo introducindo latitude e lonxitude." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -401,22 +413,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Editar: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Introducir as coordenadas para o novo nodo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Usar grados decimais." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valores negativos indican que é o hemisferio Oeste/Sur." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -425,5 +437,5 @@ msgstr "Latitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -432,28 +444,29 @@ msgstr "Lonxitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -465,9 +478,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -488,18 +501,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -511,5 +524,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -531,6 +544,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -577,5 +590,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflito" @@ -612,14 +625,15 @@ msgstr "Non hai conflitos sobre os que facer zoom" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -629,21 +643,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Ficheiro: {0}" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -msgid "There are no open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "" @@ -728,11 +742,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -811,16 +826,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -856,5 +876,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplicar" @@ -897,10 +917,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Exportar a GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Exportar os datos a un ficheiro GPX." @@ -915,12 +935,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -945,8 +965,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -957,10 +977,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -973,17 +993,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1020,22 +1040,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Por favor, selecciona polo menos dúas vías para combinar." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1045,38 +1070,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1084,33 +1105,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Introducir valores para todos os conflitos." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Resolver Conflitos" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1273,5 +1294,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Non se poden mover objectos fora do mundo." @@ -1351,28 +1372,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Ortogonalizar Forma" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1381,9 +1402,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1392,16 +1413,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 -msgid "Usage" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 -msgid "Selected Elements cannot be orthogonalized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 msgid "Orthogonalize" msgstr "Ortogonalizar" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 +msgid "Usage" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 +msgid "Selected Elements cannot be orthogonalized" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1476,18 +1497,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Invertir Vías" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Invertir a dirección de todas as vías seleccionadas." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Por favor, selecciona polo menos unha vía." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Invertir vías" @@ -1496,10 +1517,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Gardar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Gardar os datos actuais." @@ -1556,10 +1577,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Gardar como..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Gardar os datos actuais nun novo ficheiro." @@ -1604,6 +1625,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1635,5 +1655,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1698,5 +1718,5 @@ "nodos no medio da vía.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1704,5 +1724,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1710,5 +1730,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1742,34 +1762,34 @@ msgstr "Este nodo non está pegado a outra cousa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Ningún destes nodos estan pegados a outra cousa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Ningún dos nodos desta vía están pegados a outra cousa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "A selección actual non pode ser usada para despegar." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Seleccionar ou ben:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Un nodo etiquetado, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Un nodo que está sendo usado por máis dunha vía, ou" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1778,5 +1798,5 @@ "vía, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1785,5 +1805,5 @@ "vía." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1796,9 +1816,9 @@ "obterán as súas propias copias e todos os nodos serán seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Despegar Nodo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1806,5 +1826,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1839,10 +1859,10 @@ msgstr "Deseleccionar Todo (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1850,53 +1870,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Actualizar Selección" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selección valeira" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1905,5 +1921,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1911,144 +1927,7 @@ msgstr "Non hai cambios que subir." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algún dato antes." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Sincronizar o paquete de datos completo" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"A actualización fallou porque o servidor ten unha " -"nova versión de un
dos teus nodos, vías ou relacións.
O conflito foi " -"causado polo/a {0} con id {1},
o " -"servidor ten a versión {2}, a túa versión é a {3}.

Fai click en " -"{4} para sincronizar só a primitiva conflitiva.
Fai " -"click en {5} para sincronizar o paquete de datos local " -"completo co servidor.
Fai click en {6} para abortar e " -"continuar editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"A subida fallou porque o servidor tiña unha versión " -"máis recente de un
dos teus nodos, vías ou relacións.

Fai click en " -"{0} para sincronizar o paquete de datos local completo co " -"servidor.
Fai click en {1} para abortar e continuar " -"editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Actualizando primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2183,9 +2062,9 @@ msgstr "Datos GPX Descargados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Descargando datos" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2193,5 +2072,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2262,7 +2141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2279,58 +2158,52 @@ "nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos aludidos." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Debuxar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Debuxar nodos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Foco do Debuxo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "seleccionado" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Non se pode engadir un nodo fora do mundo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Engadir nodo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Engadir nodo na vía" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Conectar via existente a nodo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Engadir un novo nodo a unha via existente" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Engadir nodo a vía e conectar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Crear novo nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Seleccionar nodo baixo o cursor." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2339,14 +2212,14 @@ msgstr[1] "Insertar novo nodo en {0} vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Comezar nova vía a partir do último nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Continuar vía a partir do último nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Rematar debuxo." @@ -2388,18 +2261,19 @@ "audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Seleccionar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Seleccionar, mover e rotar obxectos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2408,17 +2282,17 @@ msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2428,13 +2302,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2443,9 +2317,9 @@ "próximo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Soltar o botón do rato para deter a rotación." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2457,5 +2331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zoom" @@ -2479,5 +2353,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Buscar obxectos." @@ -2567,7 +2441,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - todos os obxectos cambiados polo usuario" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2576,8 +2449,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - obxectro có número de nodos indicado" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:... - obxectro có número de nodos indicado" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2585,21 +2468,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - todos os obxectos cambiados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - todos os obxectos seleccionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - todos os obxectos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - todos os obxectos sen etiquetar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2608,5 +2497,5 @@ "coa expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2615,19 +2504,19 @@ "expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Usar | ou OR para combinar co operador OU lóxico" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Usar \" para escapar operadores (p.e. se a clave conten : )" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Usar ( e ) para agrupar expresións" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2635,55 +2524,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Comezar Busca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Non se atoparon coincidencias para \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Non se engadiu nada á selección buscando por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Non se eliminou da selección buscando por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Atopadas {0} coincidencias" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2697,14 +2586,14 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2713,26 +2602,29 @@ "relación" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Faltan argumentos para OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Faltan argumentos para NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Esperabase parentese de peche." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Faltan argumentos para OR." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2741,9 +2633,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Número de parámetros incorrecto para o operador nodes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2754,7 +2646,12 @@ "de nodos ou un rango, por exemplo nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Valor incorrecto do operador id: {0}. Espérase un número." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Valor incorrecto do operador id: {0}. Espérase un número." @@ -2788,17 +2685,5 @@ msgstr "Erro durante a comunicación co servidor." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 -msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 #, java-format msgid "" @@ -2806,5 +2691,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 #, java-format msgid "" @@ -2813,11 +2698,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgid "API Capabilities Violation" msgstr "" @@ -2930,5 +2819,5 @@ msgstr "Establecer {0}={1} para {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2943,5 +2832,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -3042,4 +2931,19 @@ msgstr "Resolver conflitos en estado borrado en {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3153,5 +3057,5 @@ msgstr "Aplicar?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3235,15 +3139,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, 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:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3252,5 +3156,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3259,5 +3163,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3266,5 +3170,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3273,5 +3177,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3279,5 +3183,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3286,5 +3190,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3293,5 +3197,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3300,5 +3204,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3307,10 +3211,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3318,24 +3222,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Preferencias almacenadas en {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Non se puideron subir as preferencias. Razón: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Non se puideron cargar as preferencias dende o servidor." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3344,5 +3248,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3371,5 +3275,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3391,31 +3295,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "O" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3423,5 +3320,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3432,27 +3329,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3460,5 +3357,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3470,5 +3367,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3476,25 +3373,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3502,43 +3399,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Requírese o parámetro {0} > 0. Obtívose {1}." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3546,5 +3455,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3572,10 +3481,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3583,7 +3488,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3598,5 +3503,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3614,146 +3519,138 @@ msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "A vía de estilo de área non está pechada." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "a vía multipoligonal \"{0}\" non está pechada." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Membro \"{0}\" borrado na relación." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Vía \"{0}\" con menos de dous puntos." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Atopadas máis de unha vía \"desde\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Atopadas máis de unha vía \"ata\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Atopouse máis de un \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Papel \"{0}\" descoñecido." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo de membro descoñecido para \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Non se atoparon vias \"desde\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Non se atoparon vías \"ata\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Ningún nodo o vía \"vía\" atopados." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Non se atopou o estilo para a restrición {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersección entre as vías ''{0}'' e ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "A vía interior ''{0}'' está fóra." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "Sen etiquetar" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "texto" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Erro: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "Inactivo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "seleccionado" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3762,6 +3659,6 @@ msgstr[1] "nodos" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3770,7 +3667,8 @@ msgstr[1] "vías" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3779,21 +3677,37 @@ msgstr[1] "relacións" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "vía sen etiqueta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "vía incompleta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "fondo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "destacar" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "Sen etiquetar" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "texto" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3935,5 +3849,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "Vía férrea" @@ -3949,7 +3863,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3965,4 +3879,10 @@ msgstr[1] "{0} membros" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3994,6 +3914,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Conflito" @@ -4007,7 +3927,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4092,74 +4012,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nome de usuario" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Contrasinal" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "opcións" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Amosar esta axuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Argumento de xeometría unix estandar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Descargar a caixa de límites" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Abrir ficheiro (como datos gps en bruto, se é .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Descargar a caixa de límites como datos gps en bruto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Seleccionar coa busca indicada" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Restablecer as preferencias ós valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Establecer o idioma." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4168,9 +4088,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "exemplos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4180,36 +4100,36 @@ "que cargas algo de información antes de --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "En lugar de --download= debes especificar osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Activando extensións actualizadas" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Cargando extensións anteriores" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Establecendo valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Cargando extensións" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Ficheiro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4224,22 +4144,22 @@ msgstr "Edición" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Ver" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Ferramentas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Axustes prestablecidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4247,5 +4167,5 @@ msgstr "Menú: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Audio" @@ -4324,13 +4244,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "a capa non está na lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4366,5 +4287,5 @@ msgstr "Inicializando" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4372,6 +4293,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4380,5 +4301,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4387,5 +4308,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4394,25 +4315,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4420,9 +4341,9 @@ msgstr "Papel" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4454,11 +4375,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4467,6 +4388,6 @@ msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4474,6 +4395,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4481,40 +4402,40 @@ msgstr "Membros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4522,21 +4443,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4568,22 +4489,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4591,5 +4512,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4597,30 +4518,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4628,5 +4549,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4634,14 +4555,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4649,5 +4570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4655,23 +4576,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4682,27 +4603,27 @@ msgstr "Eliminar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4711,5 +4632,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4718,5 +4639,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4725,5 +4646,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4732,5 +4653,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4739,5 +4660,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4747,5 +4668,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4982,10 +4903,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4995,10 +4916,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5083,9 +5004,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5093,6 +5014,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "" @@ -5181,7 +5102,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5191,6 +5112,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5298,4 +5219,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Borrar obxectos seleccionados." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Cambiar valores?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Descargar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Descargar datos do mapa do servidor OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Borrar obxectos seleccionados." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Abrir un editor para a relación seleccionada" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5309,12 +5282,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5332,13 +5305,13 @@ msgstr "Pila de Comandos: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5346,6 +5319,6 @@ "superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5353,25 +5326,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5383,26 +5356,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5413,41 +5386,41 @@ msgstr "Engadir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5487,5 +5460,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5500,34 +5473,34 @@ msgstr "Abrir unha lista de todas as capas cargadas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Borrar a capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Amosar/Ocultar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Cambiar o estado visible da capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Mover a capa seleccionada unha fila cara arriba." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Mover a capa seleccionada unha fila cara abaixo." @@ -5537,5 +5510,178 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relacións" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Abrir unha lista con todas as relacións." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relacións: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Abrir un editor para a relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Borrar a relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Crear unha nova relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Selección Actual" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Abrir unha ventá de lista de selección." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Facer zoom sobre o(s) elemento(s) seleccionado(s)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Facer zoom sobre a selección" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Selección" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Selección: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Desacoplar o panel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Pechar este panel. Podes reabrilo usando os botóns da barra de ferramentas " +"da esquerda." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Facer click para minimizar/maximizar o contido do panel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Autores" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "" +"Abrir a lista da xente que está a traballar nos obxectos seleccionados." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Obxectos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "incompleto" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "vía pechada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Descargar lista" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5544,22 +5690,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Cambiar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5568,5 +5714,5 @@ msgstr[1] "Cambiar as propiedades de ata {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5575,230 +5721,72 @@ msgstr[1] "Esto cambiará ata {0} obxectos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Por favor, selecciona unha tecla" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Por favor selecciona un valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "" "Por favor selecciona os obxectos dos que queres cambiar as propiedades." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Propiedades dos obxectos seleccionados." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Engadir Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Borrar da relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Borrar realmente a selección da relación {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Borrar a clave seleccionada en todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Borrar Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Engadir un novo par clave/valor para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Editar o valor da clave seleccionada para todos os obxectos" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relacións" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Abrir unha lista con todas as relacións." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relacións: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Abrir un editor para a relación seleccionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Borrar a relación seleccionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Crear unha nova relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Selección Actual" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Abrir unha ventá de lista de selección." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Facer zoom sobre o(s) elemento(s) seleccionado(s)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Facer zoom sobre a selección" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Selección" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Selección: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Desacoplar o panel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Pechar este panel. Podes reabrilo usando os botóns da barra de ferramentas " -"da esquerda." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Facer click para minimizar/maximizar o contido do panel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Autores" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "" -"Abrir a lista da xente que está a traballar nos obxectos seleccionados." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Autor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Obxectos" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5860,14 +5848,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Descargar todas as vías e nodos incompletos na relación" -msgstr[1] "Descargar todas as vías e nodos incompletos na relación" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Descargar Lugar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5890,14 +5877,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Aplicar axuste preestablecido" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Abrir un editor para a relación seleccionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5906,14 +5891,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5923,9 +5908,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5935,15 +5920,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5951,5 +5936,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5957,20 +5942,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5979,70 +5964,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Atallo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6051,9 +6035,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6062,48 +6046,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Descargar todas as vías e nodos incompletos na relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Descargar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6113,34 +6096,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6252,10 +6235,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6265,5 +6248,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6349,9 +6332,4 @@ msgid "Download Area" msgstr "Área de Descarga" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Descargar" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6653,6 +6631,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6665,6 +6641,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6935,4 +6909,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7155,5 +7133,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7196,116 +7174,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Nome" @@ -7329,15 +7307,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7508,10 +7486,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7519,5 +7497,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7525,9 +7503,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7642,6 +7620,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "descoñecido" @@ -7663,13 +7641,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7704,4 +7682,129 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Sincronizar o paquete de datos completo" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"A actualización fallou porque o servidor ten unha " +"nova versión de un
dos teus nodos, vías ou relacións.
O conflito foi " +"causado polo/a {0} con id {1},
o " +"servidor ten a versión {2}, a túa versión é a {3}.

Fai click en " +"{4} para sincronizar só a primitiva conflitiva.
Fai " +"click en {5} para sincronizar o paquete de datos local " +"completo co servidor.
Fai click en {6} para abortar e " +"continuar editando.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"A subida fallou porque o servidor tiña unha versión " +"máis recente de un
dos teus nodos, vías ou relacións.

Fai click en " +"{0} para sincronizar o paquete de datos local completo co " +"servidor.
Fai click en {1} para abortar e continuar " +"editando.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Proporciona un breve comentario para os cambios que vas a subir:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7720,39 +7823,145 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Subir Cambios" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Pechando colección de cambios..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Gardar usuario e contrasinal (sen encriptar)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +msgid "Please enter the user name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Advertencia: O contrasinal transfírese sen encriptar." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +msgid "Authenticate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Cambiar relación" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7819,17 +8028,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7842,9 +8051,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7858,9 +8067,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7875,50 +8084,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Descartar e Sair" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7926,5 +8135,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7997,40 +8206,374 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "Advanced" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Configurar os engadidos dispoñibles." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Papel \"{0}\" descoñecido." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Subir Cambios" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Acerca de" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Por favor seleccione a fila a borrar." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Obxectos para engadir:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Obxectos para modificar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Obxectos para borrar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8039,5 +8582,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8046,5 +8589,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8053,208 +8596,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Subir Cambios" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Por favor, primeiro introduce as coordenadas desexadas." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Proporciona un breve comentario para os cambios que vas a subir:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} metros" -msgstr[1] "{0} metros" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Por favor introduce unha cadea de busca" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "punto gps" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Personalizar debuxo de liñas" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Usar configuración global." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Debuxar liñas entre puntos para esta capa." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Non debuxar liñas entre puntos para esta capa." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Seleccionar as opcións de liña do debuxo" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8262,5 +8634,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8269,5 +8641,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8349,5 +8721,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "" @@ -8379,10 +8751,10 @@ msgstr[1] "{0} puntos de vía" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Convertir en capa de datos" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8392,12 +8764,12 @@ "perxudicial.
Se desexas subir trazados, mira aqui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8406,29 +8778,29 @@ msgstr "Convertido de: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Descargar todo o que abarca:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Área máxima por petición:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km cad." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8439,9 +8811,9 @@ "Desexas
continuar?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8449,5 +8821,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8457,23 +8829,23 @@ "correctamente os seus tempos foron omitidos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "fora da área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8482,5 +8854,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8494,5 +8866,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8505,11 +8877,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8518,36 +8890,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} composto de:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Convertir a capa GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8555,5 +8927,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8562,5 +8934,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8568,5 +8940,5 @@ msgstr[1] "puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8575,5 +8947,5 @@ msgstr[1] "un trazado con {0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8582,5 +8954,5 @@ msgstr[1] "{0} componse de {1} trazados" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8589,24 +8961,24 @@ msgstr[1] "{0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Ficheiros GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "O ficheiro {0} cárgase baixo o nome \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Erro durante a análise {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Non se puido ler \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8615,34 +8987,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8650,69 +9022,154 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +msgid "Override position for: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Nada seleccionado!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8721,9 +9178,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8732,134 +9185,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Valores Predeterminados" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Ler fotos..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Lendo {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Atopouse un ficheiro nulo no directorio {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Erro obtendo ficheiros do directorio {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Imaxes xeo-etiquetadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8867,52 +9242,98 @@ msgstr[1] "imaxes" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "O ficheiro non puido ser atopado" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Erro no ficheiro {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Imaxes xeo-etiquetadas" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Previo" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Reproducir a marca anterior." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Cambiar: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Eliminar foto da capa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Borrar da relación" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Seguinte" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +msgid "Show next Image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Centrar vista" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8923,5 +9344,5 @@ "Altitude: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9019,4 +9440,12 @@ msgid "Error displaying URL" msgstr "Erro amosando a URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9248,7 +9677,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Todo" @@ -9317,6 +9745,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Bicicleta" @@ -9721,31 +10149,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Habilitar servidor proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anónimo" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +msgid "Host:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +msgctxt "server" +msgid "Port:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Contrasinal" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Preferencias do proxy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Servidor proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Porto do servidor proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Nome de usuario do servidor proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Contrasinal do servidor proxy" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "A URL base do servidor OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Contrasinal de inicio de sesión da conta OSM. Deixar en branco para non " +"almacenar ningunha contrasinal." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "URL Base do Servidor" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "Contrasinal OSM" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10050,5 +10537,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10058,13 +10545,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10072,18 +10559,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Atributos Opcionais:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "vía pechada" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Tipo descoñecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10094,16 +10581,16 @@ msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Erro analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Os elementos do tipo {0} están soportados." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10112,18 +10599,18 @@ msgstr[1] "Cambiar {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Selección non axeitada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Aplicar axuste preestablecido" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Cambiar Propiedades" @@ -10152,4 +10639,11 @@ msgstr "Descargando os puntos {0} a {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10165,12 +10659,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "Exception de Punteiro Nulo, posiblemente algunhas etiquetas perdidas." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Preparando datos..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10273,16 +10822,16 @@ msgstr "Erro de análise: estrutura de documento non válida para documento gpx" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10292,40 +10841,40 @@ msgstr "Descargando datos de OSM..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10333,10 +10882,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Descargando os puntos {0} a {1}..." -msgstr[1] "Descargando os puntos {0} a {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10373,34 +10922,32 @@ msgstr "Fallo de importación NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "Esta versión de JOSM é incompatible co servidor configurado." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"Acepta as versións de protocolo 0.5 e 0.6, mentres que o servidor di que " -"acepta {0} a {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Establecida a comunicación con {0} usando o protocolo da versión {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10408,66 +10955,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Pechando colección de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Preparando..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Subindo..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Preparando datos..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Cambiar {0} obxecto" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10493,4 +11051,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10502,5 +11070,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10527,5 +11095,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10533,5 +11101,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10544,5 +11112,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10553,59 +11121,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Contrasinal ou nome de usuario incorrectos." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Advertencia: O contrasinal transfírese sen encriptar." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Gardar usuario e contrasinal (sen encriptar)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Introduce Contrasinal" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Inicio de sesión" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "A URL base do servidor OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Contrasinal de inicio de sesión da conta OSM. Deixar en branco para non " -"almacenar ningunha contrasinal." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "URL Base do Servidor" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "Contrasinal OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10695,5 +11210,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10702,38 +11224,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10741,19 +11263,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Especificación incompleta de elemento con ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Obxecto ilegal con id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10763,8 +11285,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10774,25 +11296,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10800,5 +11338,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10807,5 +11345,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10813,5 +11351,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10820,13 +11358,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Preparar os datos de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10849,21 +11387,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Pechando colección de cambios..." +msgstr[1] "Pechando colección de cambios..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Descargando os puntos {0} a {1}..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10891,9 +11441,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10954,5 +11500,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10962,4 +11508,9 @@ msgid "Uploading data ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Primitivas borradas ou movidas" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11001,12 +11552,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Borrar {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Erro borrando ficheiro de engadido: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11147,9 +11698,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "sen descripción dispoñible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11282,4 +11833,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Requírese o parámetro {0} > 0. Obtívose {1}." + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11566,6 +12132,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "" @@ -11651,5 +12217,5 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "" @@ -11660,5 +12226,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "" @@ -11673,11 +12239,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11698,7 +12261,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "imaxe" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 @@ -11832,5 +12394,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11892,21 +12454,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11915,13 +12477,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11946,17 +12508,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11968,18 +12530,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11987,5 +12549,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11993,44 +12555,44 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -12038,9 +12600,6 @@ "tamaño" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12242,5 +12801,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12433,5 +12992,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Non se cargaron datos." @@ -12453,9 +13012,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12841,7 +13400,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "" @@ -12990,19 +13549,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "" @@ -13041,32 +13600,32 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 +msgid "Capture GPS Track" +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +msgid "Connect to gpsd server and show current position in LiveGPS layer." +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 +msgid "Center Once" +msgstr "" + #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 -msgid "Capture GPS Track" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -msgid "Connect to gpsd server and show current position in LiveGPS layer." -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 -msgid "Center Once" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 msgid "Center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "" @@ -13117,9 +13676,9 @@ msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "" @@ -13157,5 +13716,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13166,13 +13725,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13313,5 +13872,5 @@ msgstr "" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13403,5 +13962,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13477,41 +14036,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13680,4 +14239,40 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +msgid "Segments" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +msgid " is not a number" +msgstr "" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13696,41 +14291,19 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" msgstr "" @@ -13746,5 +14319,5 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "" @@ -14394,38 +14967,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "" @@ -14439,5 +14982,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "" @@ -14552,10 +15095,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15253,6 +15796,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "" @@ -15698,5 +16241,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "" @@ -15814,5 +16357,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15824,5 +16367,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "" @@ -16080,4 +16623,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16109,8 +16655,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "" @@ -16258,9 +16806,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "" @@ -16505,5 +17054,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "" @@ -16538,5 +17087,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "" @@ -16570,6 +17119,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "" @@ -16619,5 +17168,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "" @@ -16805,6 +17354,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "" @@ -16925,5 +17474,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16949,4 +17497,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16956,15 +17505,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "" @@ -17176,7 +17725,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "" @@ -17595,5 +18144,5 @@ msgstr "" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17603,5 +18152,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "" @@ -18127,32 +18676,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "" @@ -18211,91 +18760,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18310,5 +18859,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18327,7 +18876,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "" @@ -18343,5 +18892,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "" @@ -18354,6 +18903,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "" @@ -18392,22 +18941,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "" @@ -18415,5 +18952,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "" @@ -18422,10 +18959,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "" @@ -18433,5 +18970,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "" @@ -18439,10 +18976,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "" @@ -18451,22 +18988,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18476,5 +19006,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18482,5 +19012,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18488,5 +19018,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -18494,5 +19024,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -18500,5 +19030,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -18507,5 +19037,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -18513,5 +19043,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -18520,5 +19050,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -18530,5 +19060,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18536,10 +19066,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "" @@ -18548,10 +19078,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -18560,5 +19090,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "" @@ -18567,5 +19097,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "" @@ -18573,5 +19103,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "" @@ -18581,5 +19111,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "" @@ -18588,17 +19118,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "" @@ -18606,5 +19144,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "" @@ -18612,5 +19150,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "" @@ -18618,5 +19156,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "" @@ -18624,15 +19162,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "" @@ -18640,10 +19178,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "" @@ -18655,5 +19193,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -18662,15 +19200,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "" @@ -18678,20 +19216,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "" @@ -18699,10 +19237,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "" @@ -18710,30 +19248,30 @@ #. item "Travel/Accomodation/Hostel" #. +#: build/trans_presets.java:1596 +msgid "Edit Hostel" +msgstr "" + +#. item "Travel/Accomodation/Hostel" text "Name" +#: build/trans_presets.java:1600 +msgid "Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" +#: build/trans_presets.java:1601 +msgid "Edit Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" text "Elevation" +#: build/trans_presets.java:1606 +msgid "Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" #: build/trans_presets.java:1607 -msgid "Edit Hostel" -msgstr "" - -#. item "Travel/Accomodation/Hostel" text "Name" +msgid "Edit Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" text "Name" #: build/trans_presets.java:1611 -msgid "Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 -msgid "Edit Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 -msgid "Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 -msgid "Edit Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 msgid "Camping Site" msgstr "" @@ -18741,10 +19279,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "" @@ -18755,5 +19293,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "" @@ -18761,5 +19299,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "" @@ -18767,5 +19305,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "" @@ -18773,61 +19311,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "" @@ -18835,9 +19373,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "" @@ -18845,9 +19383,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "" @@ -18855,18 +19393,18 @@ #. item "Food+Drinks/Pub" #. +#: build/trans_presets.java:1644 +msgid "Edit Pub" +msgstr "" + +#: build/trans_presets.java:1649 +msgid "Biergarten" +msgstr "" + +#. item "Food+Drinks/Biergarten" +#: build/trans_presets.java:1650 +msgid "Edit Biergarten" +msgstr "" + #: build/trans_presets.java:1655 -msgid "Edit Pub" -msgstr "" - -#: build/trans_presets.java:1660 -msgid "Biergarten" -msgstr "" - -#. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 -msgid "Edit Biergarten" -msgstr "" - -#: build/trans_presets.java:1666 msgid "Bar" msgstr "" @@ -18874,9 +19412,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "" @@ -18884,24 +19422,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "" @@ -18909,9 +19447,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "" @@ -18920,9 +19458,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "" @@ -18930,24 +19468,24 @@ #. item "Tourism/Viewpoint" #. +#: build/trans_presets.java:1694 +msgid "Edit Viewpoint" +msgstr "" + +#. item "Tourism/Viewpoint" text "Name" +#: build/trans_presets.java:1697 +msgid "Look-Out Tower" +msgstr "" + +#. item "Tourism/Viewpoint" check "Look-Out Tower" +#: build/trans_presets.java:1699 +msgid "Theme Park" +msgstr "" + +#. item "Tourism/Theme Park" +#: build/trans_presets.java:1700 +msgid "Edit Theme Park" +msgstr "" + #: build/trans_presets.java:1705 -msgid "Edit Viewpoint" -msgstr "" - -#. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 -msgid "Look-Out Tower" -msgstr "" - -#. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 -msgid "Theme Park" -msgstr "" - -#. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 -msgid "Edit Theme Park" -msgstr "" - -#: build/trans_presets.java:1716 msgid "Artwork" msgstr "" @@ -18955,5 +19493,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "" @@ -18961,19 +19499,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Mapa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -19011,5 +19549,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19017,28 +19555,28 @@ msgstr "" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -19048,5 +19586,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -19054,6 +19592,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "" @@ -19061,5 +19599,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19067,6 +19605,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "" @@ -19074,5 +19612,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19080,46 +19618,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19127,29 +19665,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "" @@ -19157,25 +19695,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "" @@ -19184,19 +19722,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "" @@ -19205,9 +19743,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "" @@ -19215,10 +19753,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19226,5 +19764,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19232,15 +19770,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "" @@ -19248,55 +19786,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" +msgid "Leisure" +msgstr "" + +#. group "Leisure" #: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" +msgid "Water Park" +msgstr "" + +#. item "Leisure/Water Park" +#: build/trans_presets.java:1866 +msgid "Edit Water Park" +msgstr "" + +#. item "Leisure/Water Park" text "Name" #: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 -msgid "Leisure" -msgstr "" - -#. group "Leisure" -#: build/trans_presets.java:1876 -msgid "Water Park" -msgstr "" - -#. item "Leisure/Water Park" -#: build/trans_presets.java:1877 -msgid "Edit Water Park" -msgstr "" - -#. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 msgid "Playground" msgstr "" @@ -19304,35 +19842,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "" @@ -19346,6 +19884,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "" @@ -19737,30 +20275,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "" @@ -19770,225 +20308,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -20027,21 +20565,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "tipo" @@ -20080,203 +20618,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" +#: build/trans_presets.java:1942 +msgid "Edit 10pin" +msgstr "" + +#: build/trans_presets.java:1947 +msgid "Athletics" +msgstr "" + +#. item "Sport/Athletics" +#: build/trans_presets.java:1948 +msgid "Edit Athletics" +msgstr "" + #: build/trans_presets.java:1953 -msgid "Edit 10pin" -msgstr "" - -#: build/trans_presets.java:1958 -msgid "Athletics" -msgstr "" - -#. item "Sport/Athletics" +msgid "Archery" +msgstr "" + +#. item "Sport/Archery" +#: build/trans_presets.java:1954 +msgid "Edit Archery" +msgstr "" + #: build/trans_presets.java:1959 -msgid "Edit Athletics" -msgstr "" - -#: build/trans_presets.java:1964 -msgid "Archery" -msgstr "" - -#. item "Sport/Archery" +msgid "Climbing" +msgstr "" + +#. item "Sport/Climbing" +#: build/trans_presets.java:1960 +msgid "Edit Climbing" +msgstr "" + #: build/trans_presets.java:1965 -msgid "Edit Archery" -msgstr "" - -#: build/trans_presets.java:1970 -msgid "Climbing" -msgstr "" - -#. item "Sport/Climbing" -#: build/trans_presets.java:1971 -msgid "Edit Climbing" -msgstr "" - -#: build/trans_presets.java:1976 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" +#: build/trans_presets.java:1966 +msgid "Edit Canoeing" +msgstr "" + +#. item "Sport/Cycling" +#: build/trans_presets.java:1972 +msgid "Edit Cycling" +msgstr "" + #: build/trans_presets.java:1977 -msgid "Edit Canoeing" -msgstr "" - -#. item "Sport/Cycling" +msgid "Dog Racing" +msgstr "" + +#. item "Sport/Dog Racing" +#: build/trans_presets.java:1978 +msgid "Edit Dog Racing" +msgstr "" + #: build/trans_presets.java:1983 -msgid "Edit Cycling" -msgstr "" - -#: build/trans_presets.java:1988 -msgid "Dog Racing" -msgstr "" - -#. item "Sport/Dog Racing" +msgid "Equestrian" +msgstr "" + +#. item "Sport/Equestrian" +#: build/trans_presets.java:1984 +msgid "Edit Equestrian" +msgstr "" + #: build/trans_presets.java:1989 -msgid "Edit Dog Racing" -msgstr "" - -#: build/trans_presets.java:1994 -msgid "Equestrian" -msgstr "" - -#. item "Sport/Equestrian" +msgid "Horse Racing" +msgstr "" + +#. item "Sport/Horse Racing" +#: build/trans_presets.java:1990 +msgid "Edit Horse Racing" +msgstr "" + #: build/trans_presets.java:1995 -msgid "Edit Equestrian" -msgstr "" - -#: build/trans_presets.java:2000 -msgid "Horse Racing" -msgstr "" - -#. item "Sport/Horse Racing" +msgid "Gymnastics" +msgstr "" + +#. item "Sport/Gymnastics" +#: build/trans_presets.java:1996 +msgid "Edit Gymnastics" +msgstr "" + #: build/trans_presets.java:2001 -msgid "Edit Horse Racing" -msgstr "" - -#: build/trans_presets.java:2006 -msgid "Gymnastics" -msgstr "" - -#. item "Sport/Gymnastics" +msgid "Motor Sports" +msgstr "" + +#. item "Sport/Motor Sports" +#: build/trans_presets.java:2002 +msgid "Edit Motor Sports" +msgstr "" + #: build/trans_presets.java:2007 -msgid "Edit Gymnastics" -msgstr "" - -#: build/trans_presets.java:2012 -msgid "Motor Sports" -msgstr "" - -#. item "Sport/Motor Sports" +msgid "Skating" +msgstr "" + +#. item "Sport/Skating" +#: build/trans_presets.java:2008 +msgid "Edit Skating" +msgstr "" + #: build/trans_presets.java:2013 -msgid "Edit Motor Sports" -msgstr "" - -#: build/trans_presets.java:2018 -msgid "Skating" -msgstr "" - -#. item "Sport/Skating" +msgid "Skateboard" +msgstr "" + +#. item "Sport/Skateboard" +#: build/trans_presets.java:2014 +msgid "Edit Skateboard" +msgstr "" + #: build/trans_presets.java:2019 -msgid "Edit Skating" -msgstr "" - -#: build/trans_presets.java:2024 -msgid "Skateboard" -msgstr "" - -#. item "Sport/Skateboard" -#: build/trans_presets.java:2025 -msgid "Edit Skateboard" -msgstr "" - -#: build/trans_presets.java:2030 msgid "Swimming" msgstr "" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "" @@ -20284,56 +20822,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "" @@ -20341,182 +20879,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "" #. item "Sport (Ball)/Soccer" +#: build/trans_presets.java:2044 +msgid "Edit Soccer" +msgstr "" + +#: build/trans_presets.java:2049 +msgid "Football" +msgstr "" + +#. item "Sport (Ball)/Football" +#: build/trans_presets.java:2050 +msgid "Edit Football" +msgstr "" + #: build/trans_presets.java:2055 -msgid "Edit Soccer" -msgstr "" - -#: build/trans_presets.java:2060 -msgid "Football" -msgstr "" - -#. item "Sport (Ball)/Football" +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2056 +msgid "Edit Australian Football" +msgstr "" + #: build/trans_presets.java:2061 -msgid "Edit Football" -msgstr "" - -#: build/trans_presets.java:2066 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" +msgid "Baseball" +msgstr "" + +#. item "Sport (Ball)/Baseball" +#: build/trans_presets.java:2062 +msgid "Edit Baseball" +msgstr "" + #: build/trans_presets.java:2067 -msgid "Edit Australian Football" -msgstr "" - -#: build/trans_presets.java:2072 -msgid "Baseball" -msgstr "" - -#. item "Sport (Ball)/Baseball" +msgid "Basketball" +msgstr "" + +#. item "Sport (Ball)/Basketball" +#: build/trans_presets.java:2068 +msgid "Edit Basketball" +msgstr "" + #: build/trans_presets.java:2073 -msgid "Edit Baseball" -msgstr "" - -#: build/trans_presets.java:2078 -msgid "Basketball" -msgstr "" - -#. item "Sport (Ball)/Basketball" +msgid "Golf" +msgstr "" + +#. item "Sport (Ball)/Golf" +#: build/trans_presets.java:2074 +msgid "Edit Golf" +msgstr "" + +#. item "Sport (Ball)/Golf" combo "type" +#: build/trans_presets.java:2077 +msgid "golf_course" +msgstr "" + #: build/trans_presets.java:2079 -msgid "Edit Basketball" -msgstr "" - -#: build/trans_presets.java:2084 -msgid "Golf" -msgstr "" - -#. item "Sport (Ball)/Golf" +msgid "Boule" +msgstr "" + +#. item "Sport (Ball)/Boule" +#: build/trans_presets.java:2080 +msgid "Edit Boule" +msgstr "" + #: build/trans_presets.java:2085 -msgid "Edit Golf" -msgstr "" - -#. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 -msgid "golf_course" -msgstr "" - -#: build/trans_presets.java:2090 -msgid "Boule" -msgstr "" - -#. item "Sport (Ball)/Boule" +msgid "Bowls" +msgstr "" + +#. item "Sport (Ball)/Bowls" +#: build/trans_presets.java:2086 +msgid "Edit Bowls" +msgstr "" + #: build/trans_presets.java:2091 -msgid "Edit Boule" -msgstr "" - -#: build/trans_presets.java:2096 -msgid "Bowls" -msgstr "" - -#. item "Sport (Ball)/Bowls" +msgid "Cricket" +msgstr "" + +#. item "Sport (Ball)/Cricket" +#: build/trans_presets.java:2092 +msgid "Edit Cricket" +msgstr "" + #: build/trans_presets.java:2097 -msgid "Edit Bowls" -msgstr "" - -#: build/trans_presets.java:2102 -msgid "Cricket" -msgstr "" - -#. item "Sport (Ball)/Cricket" +msgid "Cricket Nets" +msgstr "" + +#. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + #: build/trans_presets.java:2103 -msgid "Edit Cricket" -msgstr "" - -#: build/trans_presets.java:2108 -msgid "Cricket Nets" -msgstr "" - -#. item "Sport (Ball)/Cricket Nets" +msgid "Croquet" +msgstr "" + +#. item "Sport (Ball)/Croquet" +#: build/trans_presets.java:2104 +msgid "Edit Croquet" +msgstr "" + #: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 -msgid "Croquet" -msgstr "" - -#. item "Sport (Ball)/Croquet" +msgid "Hockey" +msgstr "" + +#. item "Sport (Ball)/Hockey" +#: build/trans_presets.java:2110 +msgid "Edit Hockey" +msgstr "" + #: build/trans_presets.java:2115 -msgid "Edit Croquet" -msgstr "" - -#: build/trans_presets.java:2120 -msgid "Hockey" -msgstr "" - -#. item "Sport (Ball)/Hockey" +msgid "Pelota" +msgstr "" + +#. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + #: build/trans_presets.java:2121 -msgid "Edit Hockey" -msgstr "" - -#: build/trans_presets.java:2126 -msgid "Pelota" -msgstr "" - -#. item "Sport (Ball)/Pelota" +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" +msgid "Rugby" +msgstr "" + +#. item "Sport (Ball)/Rugby" +#: build/trans_presets.java:2128 +msgid "Edit Rugby" +msgstr "" + #: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" +msgid "Table Tennis" +msgstr "" + +#. item "Sport (Ball)/Table Tennis" +#: build/trans_presets.java:2134 +msgid "Edit Table Tennis" +msgstr "" + #: build/trans_presets.java:2139 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2144 -msgid "Table Tennis" -msgstr "" - -#. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 -msgid "Edit Table Tennis" -msgstr "" - -#: build/trans_presets.java:2150 msgid "Tennis" msgstr "" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "" @@ -20524,5 +21062,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "" @@ -20530,10 +21068,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "" @@ -20541,10 +21079,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "" @@ -20552,10 +21090,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "" @@ -20564,10 +21102,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "" @@ -20576,10 +21114,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "" @@ -20589,10 +21127,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "" @@ -20601,10 +21139,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "" @@ -20612,5 +21150,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "" @@ -20618,15 +21156,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "" @@ -20634,10 +21172,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "" @@ -20645,10 +21183,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "" @@ -20656,5 +21194,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "" @@ -20662,5 +21200,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "" @@ -20669,10 +21207,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "" @@ -20681,9 +21219,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "" @@ -20691,10 +21229,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "" @@ -20703,10 +21241,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "" @@ -20716,5 +21254,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "" @@ -20723,6 +21261,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "" @@ -20731,66 +21269,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "" @@ -20799,81 +21337,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "" @@ -20882,5 +21420,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "" @@ -20888,5 +21426,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "" @@ -20894,20 +21432,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "" @@ -20916,5 +21459,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "" @@ -20922,61 +21465,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "" #. group "Man Made" +#: build/trans_presets.java:2294 +msgid "Works" +msgstr "" + +#. item "Man Made/Works" +#: build/trans_presets.java:2295 +msgid "Edit Works" +msgstr "" + +#. item "Man Made/Works" text "Name" +#: build/trans_presets.java:2299 +msgid "Tower" +msgstr "" + +#. item "Man Made/Tower" +#: build/trans_presets.java:2300 +msgid "Edit Tower" +msgstr "" + +#. item "Man Made/Tower" text "Name" +#: build/trans_presets.java:2303 +msgid "Tower type" +msgstr "" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2303 +msgid "communication" +msgstr "" + +#: build/trans_presets.java:2303 +msgid "observation" +msgstr "" + +#. #: build/trans_presets.java:2305 -msgid "Works" -msgstr "" - -#. item "Man Made/Works" -#: build/trans_presets.java:2306 -msgid "Edit Works" -msgstr "" - -#. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 -msgid "Tower" -msgstr "" - -#. item "Man Made/Tower" -#: build/trans_presets.java:2311 -msgid "Edit Tower" -msgstr "" - -#. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 -msgid "Tower type" -msgstr "" - -#. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 -msgid "communication" -msgstr "" - -#: build/trans_presets.java:2314 -msgid "observation" -msgstr "" - -#. -#: build/trans_presets.java:2316 msgid "Height (meters)" msgstr "" @@ -20984,25 +21527,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "" @@ -21010,10 +21553,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "" @@ -21021,10 +21564,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "" @@ -21033,37 +21576,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "" @@ -21073,10 +21616,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "" @@ -21084,10 +21627,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "" @@ -21095,10 +21638,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "" @@ -21106,10 +21649,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "" @@ -21117,5 +21660,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "" @@ -21123,5 +21666,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "" @@ -21131,35 +21674,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "" @@ -21168,10 +21711,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "" @@ -21180,5 +21723,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "" @@ -21186,10 +21729,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "" @@ -21200,23 +21743,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "" @@ -21225,75 +21768,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "" @@ -21302,5 +21845,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "" @@ -21308,5 +21851,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "" @@ -21314,5 +21857,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "" @@ -21320,5 +21863,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21326,5 +21869,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "" @@ -21332,15 +21875,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "" @@ -21349,5 +21892,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "" @@ -21355,36 +21898,31 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" -msgstr "" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" msgstr "" @@ -21392,31 +21930,31 @@ #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21487,39 +22025,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "" @@ -21528,30 +22066,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "" @@ -21560,10 +22098,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "" @@ -21572,10 +22110,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21583,33 +22121,56 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" +#: build/trans_presets.java:2498 +msgid "Shops" +msgstr "" + +#. group "Shops" +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +msgid "Bike Dealer" +msgstr "" + +#. item "Shops/Bike Dealer" +#. #: build/trans_presets.java:2509 -msgid "Shops" -msgstr "" - -#. group "Shops" -#: build/trans_presets.java:2510 +msgid "Edit Bicycle Shop" +msgstr "" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "" @@ -21617,9 +22178,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "" @@ -21627,27 +22188,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "" @@ -21655,5 +22216,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "" @@ -21661,88 +22222,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "" @@ -21750,9 +22311,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "" @@ -21760,9 +22321,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "" @@ -21770,18 +22331,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21789,54 +22350,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "" @@ -21844,9 +22405,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21854,9 +22415,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "" @@ -21864,54 +22425,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "" @@ -21919,9 +22480,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "" @@ -21929,9 +22490,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "" @@ -21939,28 +22500,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "" @@ -21968,14 +22529,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "" @@ -21983,5 +22544,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "" @@ -21989,15 +22550,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "" @@ -22005,18 +22566,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "" @@ -22024,5 +22585,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "" @@ -22030,9 +22591,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "" @@ -22040,10 +22601,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -22052,5 +22613,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -22059,20 +22620,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -22080,5 +22641,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "" @@ -22087,64 +22648,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Lugares" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "" @@ -22152,15 +22713,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "" @@ -22168,10 +22729,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "" @@ -22179,25 +22740,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "" @@ -22205,5 +22766,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "" @@ -22211,10 +22772,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "" @@ -22222,10 +22783,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22233,5 +22794,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22239,5 +22800,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "" @@ -22245,10 +22806,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "" @@ -22256,10 +22817,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "" @@ -22267,10 +22828,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "" @@ -22278,70 +22839,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "" @@ -22350,15 +22911,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "" @@ -22367,5 +22928,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "" @@ -22373,17 +22934,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "" @@ -22392,14 +22953,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "" @@ -22407,25 +22968,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22433,10 +22994,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "" @@ -22444,5 +23005,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "" @@ -22450,5 +23011,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "" @@ -22457,45 +23018,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "" @@ -22503,25 +23064,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22529,10 +23090,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22540,20 +23101,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "" @@ -22561,5 +23122,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -22567,15 +23128,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "" @@ -22583,9 +23144,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "" @@ -22593,39 +23154,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "" @@ -22633,15 +23194,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "" @@ -22649,55 +23210,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "" @@ -22707,5 +23268,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "" @@ -22714,10 +23275,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "" @@ -22725,5 +23286,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22732,5 +23293,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22738,34 +23299,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "" @@ -22774,15 +23335,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "" @@ -22790,5 +23351,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22797,5 +23358,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22803,5 +23364,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22873,24 +23434,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22943,5 +23504,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22950,13 +23511,13 @@ msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -22970,10 +23531,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -22981,31 +23542,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -23014,30 +23575,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23248,130 +23809,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23388,98 +23823,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "" @@ -23856,7 +24200,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23920,13 +24264,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23942,5 +24365,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23954,5 +24377,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23973,5 +24396,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "" @@ -23986,5 +24409,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23999,5 +24422,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "" @@ -24011,5 +24434,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "" @@ -24023,5 +24446,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "" @@ -24043,16 +24466,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24149,4 +24560,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24215,13 +24633,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24267,6 +24685,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24283,7 +24701,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24306,10 +24724,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24345,11 +24763,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24390,6 +24809,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24403,5 +24822,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "" @@ -24423,5 +24842,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24435,5 +24854,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24441,4 +24860,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24488,7 +24914,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "" @@ -24505,5 +24931,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24518,5 +24944,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24531,5 +24957,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24544,5 +24970,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24557,5 +24983,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24570,5 +24996,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24688,11 +25114,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "" @@ -24706,5 +25132,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "" @@ -24718,5 +25144,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "" @@ -24844,12 +25270,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "" @@ -24863,5 +25306,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "" @@ -24899,4 +25342,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24915,4 +25374,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24933,8 +25400,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -25036,10 +25505,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25293,5 +25762,5 @@ #. #. -#. +#. #. color health #. @@ -25437,4 +25906,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25454,23 +25931,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25502,6 +25979,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25562,14 +26039,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25916,5 +26393,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25937,5 +26413,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "" @@ -26007,8 +26484,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "" @@ -26109,9 +26586,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "" @@ -26199,9 +26676,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "" @@ -26215,5 +26692,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "" @@ -26227,5 +26704,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26247,5 +26724,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "" @@ -26259,5 +26736,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "" @@ -26271,5 +26748,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26292,5 +26769,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "" @@ -26304,5 +26781,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "" @@ -26316,5 +26793,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26328,5 +26805,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26340,5 +26817,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26395,7 +26872,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "" @@ -26409,5 +26886,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "" @@ -26420,5 +26897,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "" @@ -26433,5 +26910,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "" @@ -26445,5 +26922,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "" @@ -26498,8 +26975,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26513,5 +26990,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "" @@ -26525,5 +27002,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "" @@ -26537,5 +27014,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26549,5 +27026,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "" @@ -26561,5 +27038,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "" @@ -26637,8 +27114,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "" @@ -26686,7 +27163,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "" @@ -26836,11 +27313,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "" @@ -26888,6 +27365,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "" @@ -27243,60 +27720,49 @@ msgstr "" -#~ msgid "Images for {0}" -#~ msgstr "Imaxes para {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Ler GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Non hai hora para o punto {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Non se atoparon imaxes con marcas de tempo lexibles." - -#~ msgid "GPS start: {0}" -#~ msgstr "Inicio GPS: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "Fin GPS: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "delta actual: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "Diferencia de zona horaria: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} dentro da traza." - -#~ msgid "Sync clock" -#~ msgstr "Sincronizar reloxo" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "A data no ficheiro \"{0}\" non puido ser analizada." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Non hai hora EXIF no ficheiro \"{0}\"." - -#~ msgid "Image" -#~ msgstr "Imaxe" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Zona horaria da unidade GPS (differencia coa foto)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Sincronizar hora coa da unidade GPS" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "A hora introducida non puido ser analizada." - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Abrir imaxes con AgPifoJ..." +#~ msgid "Updating primitive" +#~ msgstr "Actualizando primitiva" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Esperabase parentese de peche." + +#~ msgid "Default Values" +#~ msgstr "Valores Predeterminados" + +#~ msgid "Enable proxy server" +#~ msgstr "Habilitar servidor proxy" + +#~ msgid "Anonymous" +#~ msgstr "Anónimo" + +#~ msgid "Proxy server host" +#~ msgstr "Servidor proxy" + +#~ msgid "Proxy server port" +#~ msgstr "Porto do servidor proxy" + +#~ msgid "Proxy server username" +#~ msgstr "Nome de usuario do servidor proxy" + +#~ msgid "Proxy server password" +#~ msgstr "Contrasinal do servidor proxy" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "" +#~ "Exception de Punteiro Nulo, posiblemente algunhas etiquetas perdidas." + +#~ msgid "Preparing..." +#~ msgstr "Preparando..." + +#~ msgid "Uploading..." +#~ msgstr "Subindo..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Contrasinal ou nome de usuario incorrectos." + +#~ msgid "Enter Password" +#~ msgstr "Introduce Contrasinal" + +#~ msgid "Login" +#~ msgstr "Inicio de sesión" #~ msgid "Be sure to include the following information:" @@ -27384,4 +27850,43 @@ #~ msgstr "Borrar Capa" +#~ msgid "Images for {0}" +#~ msgstr "Imaxes para {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Ler GPX..." + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Non se atoparon imaxes con marcas de tempo lexibles." + +#~ msgid "GPS start: {0}" +#~ msgstr "Inicio GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Fin GPS: {0}" + +#~ msgid "timezone difference: " +#~ msgstr "Diferencia de zona horaria: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} dentro da traza." + +#~ msgid "Sync clock" +#~ msgstr "Sincronizar reloxo" + +#~ msgid "Image" +#~ msgstr "Imaxe" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Zona horaria da unidade GPS (differencia coa foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Sincronizar hora coa da unidade GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "A hora introducida non puido ser analizada." + #~ msgid "Login name (email) to the OSM account." #~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM." @@ -27413,4 +27918,13 @@ #~ msgid "Select a bookmark first." #~ msgstr "Selecciona primeiro un marcador." + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Non hai hora para o punto {0} x {1}" + +#~ msgid "current delta: {0}s" +#~ msgstr "delta actual: {0}s" #~ msgid "Use preset ''{0}'' of group ''{1}''" @@ -27477,9 +27991,12 @@ #~ "{0}" -#~ msgid "File could not be found." -#~ msgstr "O ficheiro non puido ser atopado" - #~ msgid "Unknown file extension." #~ msgstr "Extensión de ficheiro descoñecida." + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "A data no ficheiro \"{0}\" non puido ser analizada." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Non hai hora EXIF no ficheiro \"{0}\"." #~ msgid "File not found" @@ -27657,4 +28174,7 @@ #~ msgid "Public" #~ msgstr "Público" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Abrir imaxes con AgPifoJ..." #~ msgid "Checking whether node {0} is gone ..." Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 19198) +++ /applications/editors/josm/i18n/po/he.po (revision 19199) @@ -4,9 +4,10 @@ # FIRST AUTHOR , 2008. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" "PO-Revision-Date: 2009-10-17 15:07+0000\n" "Last-Translator: Tsvi Mostovicz \n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "יוצר ממשקי גרפי ראשי" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "עזרה" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "אזהרה" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "אין אפשרות לקרוא קובץ''{0}''.
הודעת שגיאה:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "אין אפשרות לקרוא קובץ''{0}''.
הודעת שגיאה:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "אודות JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -279,5 +281,5 @@ "ההיסטוריה תיכשל. URL בסיס של ה-API הוא: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -288,5 +290,5 @@ "תיכשל. URL בסיס של ה-API הוא: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -295,15 +297,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "המשך" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -312,29 +319,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -351,5 +359,9 @@ msgstr "ביטול" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "אנא בחר לפחות צומת, דרך, או הקשר אשר כבר הועלו למאגר" @@ -365,5 +377,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "מזג" @@ -381,15 +393,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "הוסף נקודה..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "הוסף נקודה ע\"י הכנסת קווי אורך ורוחב" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -405,22 +417,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "ערוך: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "הכנס את הקורדינטות של הנקודה החדשה." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "השתמש במעלות עשרוניות." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "ערכים שליליים מציינים חצי כדור מערבי\\דרומי." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -429,5 +441,5 @@ msgstr "קו רוחב" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -436,28 +448,29 @@ msgstr "קו אורך" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -469,9 +482,9 @@ msgstr "אישור" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -492,18 +505,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -515,5 +528,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -535,6 +548,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -581,5 +594,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "התנגשות" @@ -616,14 +629,15 @@ msgstr "אין התנגשויות להתמקד בהם" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -633,21 +647,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "קובץ: {0}" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -msgid "There are no open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "" @@ -729,11 +743,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -811,16 +826,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -856,5 +876,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "שכפל" @@ -897,10 +917,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "ייצא ל-GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "ייצא נתונים לקובץ GPX." @@ -915,12 +935,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -945,8 +965,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -957,10 +977,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -973,17 +993,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1020,22 +1040,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "אחד שטחים חופפים" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "מאחד שטחים חופפים זה לזה" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "נא בחר לפחות שתי דרכים לשילוב." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1045,38 +1070,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "בטל אם אינך בטוח" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1084,33 +1105,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "הזן ערכים לכל ההתנגשויות." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "פתור התנגשויות" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1273,5 +1294,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "לא ניתן להזיז פריטים אל מחוץ לעולם." @@ -1351,28 +1372,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "ישר זוויות צורה" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1381,9 +1402,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1392,16 +1413,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 -msgid "Usage" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 -msgid "Selected Elements cannot be orthogonalized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 msgid "Orthogonalize" msgstr "יישר" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 +msgid "Usage" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 +msgid "Selected Elements cannot be orthogonalized" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1474,18 +1495,18 @@ msgstr "לא ניתן לשנות את שם הקובץ ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "הפוך דרכים" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "הפוך את הכיוונים של כל הדרכים הנבחרות." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "אנא בחר לפחות דרך אחת." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "הפוך דרכים" @@ -1494,10 +1515,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "שמירה" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "שמור את הנתונים הנוכחיים." @@ -1554,10 +1575,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "שמור בשם..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "שמור את המידע הנוכחי לקובץ חדש." @@ -1599,6 +1620,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1630,5 +1650,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1687,5 +1707,5 @@ msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1693,5 +1713,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1699,5 +1719,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1731,43 +1751,43 @@ msgstr "הנקודה לא מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "הבחירה הנוכחית אינה יכולה לשמש להפרדה." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "בחר:" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +msgid "* One tagged node, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way, or" msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* דרך אחת בעלת אחת או יותר נקודות המשותפות ליותר מדרך אחת, או" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "* דרך אחת ונקודה אחת או יותר שלה המשותפות ליותר מדרך אחת." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1777,9 +1797,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "הפרד נקודה" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1787,5 +1807,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1820,10 +1840,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1831,53 +1851,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "עדכן בחירה" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "בחירה ריקה" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1886,5 +1902,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1892,131 +1908,7 @@ msgstr "אין שינויים להעלאה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "אין מה להעלות. קבל כמה נתונים תחילה." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "סנכרן את כל סט הנתונים" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2151,9 +2043,9 @@ msgstr "הורדו נתוני GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "מוריד נתונים" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2161,5 +2053,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2230,7 +2122,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2247,58 +2139,52 @@ "דרך. Ctrl: מחק פריטים מפנים." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "צייר" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "צייר צמתים" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "נבחר" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "לא ניתן להוסיף צומת מחוץ לעולם" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "הוסף צומת" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "הוסף צומת לדרך" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "חבר דרך קיימת לצומת" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "הוסף צומת חדש לדרך קיימת" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "הוסף צומת לדרך וחבר" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "יוצר נקודה חדשה." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "בחר את הנקודה שמתחת לסמן." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2307,14 +2193,14 @@ msgstr[1] "הוסף נקודה חדשה ל-{0} דרכים." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "התחל דרך חדשה מהנקודה האחרונה." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "המשך דרך מהנקודה האחרונה." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "הפסק לצייר." @@ -2355,18 +2241,19 @@ "לסנכרון השמע בנקודה זו." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "בחר" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "בחר, הזז והטה פריטים" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2375,17 +2262,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2395,13 +2282,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2409,9 +2296,9 @@ "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "שחרר את סמן העכבר להפסקת ההטייה" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2421,5 +2308,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "מיקוד" @@ -2441,5 +2328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "חיפוש אחר פריטים." @@ -2529,7 +2416,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:...-כל העצמים ששונו ע\"י המשתמש" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2538,8 +2424,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:...-עצמים עם מספר הנקודות הנתון" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:...-עצמים עם מספר הנקודות הנתון" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2547,45 +2443,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified...- כל העצמים ששונו" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - כל העצמים הבחורים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - כל העצמים הבלתי גמורים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - כל העצמים הלא מתוייגים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "השתמש ב-| או OR כדי לחבר ב\"או\" לוגי" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "השתמש ב-( ו ) כדי לצרף ביטויים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2593,55 +2495,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "חפש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "התחל חיפוש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "לא נמצאה התאמה עבור \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "נמצאו {0} התאמות" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2654,40 +2556,43 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "חסרים ארגומנטים ל-or." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "חסרים ארגומנטים ל-not." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "ציפיתי לסוגר סוגריים." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "חסרים ארגומנטים ל-or." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2696,9 +2601,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2707,7 +2612,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2741,38 +2651,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 -msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format msgid "" "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "הזהרה: מגביל אוטומטית את ערך התוית \"{0}\" על גבי פרימיטיב מחוק {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format msgid "" "Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" -"אורך ערך התוית \"{0}\" על פרימיטיב {1} חורג מאורך מקסימלי אפשרי {2}. אורך " -"הערך הוא {3}." + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgid "API Capabilities Violation" msgstr "" @@ -2885,5 +2785,5 @@ msgstr "קבע {0}={1} עבור {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2898,5 +2798,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -2996,4 +2896,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3105,5 +3020,5 @@ msgstr "החל?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3185,15 +3100,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "קובץ תצורה לא תקין בשורות {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3202,5 +3117,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3209,5 +3124,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3216,5 +3131,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3223,5 +3138,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3229,5 +3144,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3236,5 +3151,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3243,5 +3158,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3250,5 +3165,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3257,10 +3172,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3268,24 +3183,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "מאפיינים נשמרו ב {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "לא יכול להעלות מאפיינים. סיבה: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "לא יכול לטעון מאפיינים משרת." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3294,5 +3209,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3321,5 +3236,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3341,31 +3256,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "דרום" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "צפון" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "מערב" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "מזרח" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3373,5 +3281,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3382,27 +3290,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3410,5 +3318,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3420,5 +3328,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3426,25 +3334,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3452,43 +3360,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "פרמטר ''{0}'' אינו יכול להיות אפס" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3496,5 +3416,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3522,10 +3442,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3533,7 +3449,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3548,5 +3464,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3564,146 +3480,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "מחק איבר \"{0}\" ביחס." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "הדרך \"{0}\" בת פחות משתי נקודות." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "יותר מ-\"to\" אחד נמצא." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "יותר מ-\"via\" אחד נמצא." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "אף דרך \"from\" לא נמצאה." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "אף דרך \"to\" לא נמצאה." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "דרך פנימית ''{0}'' נמצאת בחוץ." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "לא מתוייג" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "טקסט" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "שגיאה: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "אזהרה: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "לא פעיל" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "נבחר" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3712,6 +3620,6 @@ msgstr[1] "צמתים" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3720,7 +3628,8 @@ msgstr[1] "דרכים" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3729,20 +3638,36 @@ msgstr[1] "יחסים" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "דרך לא מתויגת" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "דרך לא גמורה" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "רקע" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" +msgstr "" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "לא מתוייג" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "טקסט" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" msgstr "" @@ -3885,5 +3810,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "מסילת רכבת" @@ -3899,7 +3824,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3915,4 +3840,10 @@ msgstr[1] "{0} חברים" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3944,6 +3875,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "התנגשות" @@ -3957,7 +3888,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4042,74 +3973,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "שם משתמש" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "סיסמא" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "שימוש" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "אפשרויות" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "הצג עזרה זו" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "הורד את המיקום שבכתובת (עם lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "פתח קובץ (כ-gps גולמי, אם gpx.)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "בחר עם החיפוש הנתון" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "אפס את המאפיינים לברירת מחדל" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "קבע את השפה." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4118,9 +4049,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "דוגמאות" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4128,36 +4059,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "מפעיל תוספים מעודכנים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "טען תוספים מוקדמים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "קביעת ברירות מחדל" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "טעינת תוספים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "קובץ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4172,22 +4103,22 @@ msgstr "ערוך" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "תצוגה" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "כלים" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4195,5 +4126,5 @@ msgstr "תפריט: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "שמע" @@ -4272,13 +4203,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "השכבה אינה ברשימה." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4311,5 +4243,5 @@ msgstr "מאתחל" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4317,6 +4249,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4325,5 +4257,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4332,5 +4264,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4339,25 +4271,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4365,9 +4297,9 @@ msgstr "תפקיד" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4399,11 +4331,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "תכונות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4412,6 +4344,6 @@ msgstr "תוויות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4419,6 +4351,6 @@ msgstr "נקודות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4426,40 +4358,40 @@ msgstr "חברים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "נקודות (פתורות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "נקודות (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "חברים (פתורים)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4467,21 +4399,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "חברים (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "תכונות (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4513,22 +4445,22 @@ msgstr "הפריט {0} לא נמצא ברשימה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "נעל גלילה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "השווה " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "הגירסה שלי" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4536,5 +4468,5 @@ msgstr "גירסה ממוזגת" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4542,30 +4474,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "הגירסה שלהם" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> ראש" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "העתק את הנקודות הנבחרות שלי לראשית רשימת הנקודות הממוזגת" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> תחתית" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "העתק את האלמנטים הנבחרים שלי לסוף רשימת האלמנטים הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4575,5 +4507,5 @@ "הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4583,14 +4515,14 @@ "הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "העתק את האלמנט הנבחר שלהם לתחילת רשימת האלמנטים הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "העתק את האלמנטים הנבחרים שלהם לסוף רשימת האלמנטים הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4600,5 +4532,5 @@ "הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4608,23 +4540,23 @@ "הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "מעלה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "העלה את האלמנט הנבחר מקום אחד" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "מטה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "העלה את האלמנטים הנבחרים מקום אחד" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4635,27 +4567,27 @@ msgstr "הסר" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "הקפה" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "הקפה" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "הקפה את הרשימה הנוכחית של אלמנטים ממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "הפשר" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4664,5 +4596,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4671,5 +4603,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4678,5 +4610,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4685,5 +4617,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4692,5 +4624,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4700,5 +4632,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4933,10 +4865,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4946,10 +4878,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5034,9 +4966,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5044,6 +4976,6 @@ msgstr "כלום" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "הכל" @@ -5132,7 +5064,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5142,6 +5074,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5249,4 +5181,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "מחק את הפריטים הנבחרים." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "לשנות ערכים?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "הורד" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "הורד נתוני מפה משרת ה-OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "מחק את הפריטים הנבחרים." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "פתח עורך עבור היחס הנבחר" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5260,12 +5244,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5283,18 +5267,18 @@ msgstr "מצבור פקודות: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "פתור" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "פתח את תיבת דו-שיח עבור כל הפריטים הנבחרים ברשימה שלהלן." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5302,25 +5286,25 @@ msgstr "הגדר את הפריטים הנבחרים שעל המפה לפריטים הנבחרים ברשימה שלהלן." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "בטל את פתרון ההתנגשות וסגור את הדיאלוג" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "החל פתרון" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "המשך לפתור" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5332,26 +5316,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "פתור התנגשויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5362,41 +5346,41 @@ msgstr "הוסף" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5435,5 +5419,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5448,34 +5432,34 @@ msgstr "פתח רשימה המכילה את כל השכבות שנטענו." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "מחק את השכבה הנבחרת." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "הצג/הסתר" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "מחליף את המצב החזותי של השכבה הנבחרת." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "העבר את השכבה הנבחרת שורה אחת מעלה." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "העבר את השכבה הנוכחית שורה אחת מטה." @@ -5485,5 +5469,175 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "יחסים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "פתח רשימה של כל היחסים." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "יחסים: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "פתח עורך עבור היחס הנבחר" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "מחק את היחס הנבחר" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "צור יחס חדש" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "הבחירה הנוכחית" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "פתח חלון רשימת בחירה." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "התאם מיקוד לאלמנט\\ים הבחור\\ים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "התאם מיקוד לבחירה" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "בחר: יחסים:{0} \\ דרכים: {1} \\ נקודות: {2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "בחירה" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "בחירה: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "\"שחרר\" את הפאנל" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "מחברים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "פתח את רשימת האנשים שעובדים על העצמים הנבחרים." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "מחבר" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# עצמים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "לא גמור" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "סגור" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "הורד רשימה" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5492,22 +5646,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "<שונה>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "לשנות ערכים?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5516,5 +5670,5 @@ msgstr[1] "שנה תכונות של עד {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5523,226 +5677,71 @@ msgstr[1] "זה ישנה עד {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "נא בחר מפתח" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "נא בחר ערך" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "תכונות\\חברויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "תכונות לעצמים שנבחרו." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "חבר ב" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "הוסף תכונות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "תכונות: {0} \\ חברויות: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "תכונות \\ חברויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "שנה יחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "מחק מיחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "באמת מחק את הבחירה מהיחס {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "מחק את המפתח הנבחר בכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "מחק מאפיינים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "הוסף מצד מפתח/ערך לכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "יחסים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "פתח רשימה של כל היחסים." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "יחסים: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "פתח עורך עבור היחס הנבחר" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "מחק את היחס הנבחר" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "צור יחס חדש" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "הבחירה הנוכחית" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "פתח חלון רשימת בחירה." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "התאם מיקוד לאלמנט\\ים הבחור\\ים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "התאם מיקוד לבחירה" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "בחר: יחסים:{0} \\ דרכים: {1} \\ נקודות: {2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "בחירה" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "בחירה: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "\"שחרר\" את הפאנל" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "מחברים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "פתח את רשימת האנשים שעובדים על העצמים הנבחרים." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "מחבר" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# עצמים" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5804,14 +5803,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס" -msgstr[1] "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "מיקום ההורדה" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5834,14 +5832,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "החל פתרון" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "פתח עורך עבור היחס הנבחר" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5850,14 +5846,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5867,9 +5863,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5879,15 +5875,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5895,5 +5891,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5901,20 +5897,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5923,70 +5919,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "ספורט" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "הזז את החברים הנבחרים מעלה" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "הזז מטה את החברים שנבחרו" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5995,9 +5990,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6006,48 +6001,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "הורד חברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6057,34 +6051,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6196,10 +6190,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6209,5 +6203,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6292,9 +6286,4 @@ msgid "Download Area" msgstr "הורדת איזור" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "הורד" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6593,6 +6582,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6605,6 +6592,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6875,4 +6860,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7095,5 +7084,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7136,116 +7125,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "שם" @@ -7269,15 +7258,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "סוג" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7448,10 +7437,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7459,5 +7448,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7465,9 +7454,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7582,6 +7571,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "לא ידוע" @@ -7603,13 +7592,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7644,4 +7633,116 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "סנכרן את כל סט הנתונים" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "ספק הערה קצרה לשינויים שאתה מעלה:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7660,39 +7761,146 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "העלה שינויים" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +msgid "Upload to an existing changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "שמור את המשתמש והסיסמא (לא מוצפנים)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "הזן שם משתמש" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "אזהרה: הסיסמא נשלחת בצורה לא מוצפנת." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "אתלטיקה" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "שנה יחס" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7759,17 +7967,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7782,9 +7990,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7798,9 +8006,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7815,50 +8023,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "התעלם משינויים וצא" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7866,5 +8074,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7937,40 +8145,375 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "מסלול מתקדמים" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "התאם תוספים זמינים." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "העלה ל-OSM..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "העלה שינויים" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "אודות" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "נא בחר את השורה למחיקה." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "פריטים להוספה:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "פריטים לשינוי:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "פריטים למחיקה:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7979,5 +8522,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -7986,5 +8529,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -7993,208 +8536,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "העלה שינויים" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "נא הזן את נקודות הציון הרצויות תחילה." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "ספק הערה קצרה לשינויים שאתה מעלה:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} מטרים" -msgstr[1] "{0} מטרים" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "הזן שם משתמש" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "נקודת gps" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "התאם ציור קו" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "השתמש בהגדרות הגלובליות." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "צייר קווים בין נקודות בשכבה זו." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "אל תצייר קווים בין נקודות בשכבה זו." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "בחר אפשרויות ציור קו" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8202,5 +8574,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8209,5 +8581,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8289,5 +8661,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "תיאור" @@ -8319,10 +8691,10 @@ msgstr[1] "{0} נקודות דרך" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "המר לשכבת נתונים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8332,12 +8704,12 @@ "מסלולים, ראה כאן:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8346,29 +8718,29 @@ msgstr "המר מ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "הורד הכל עם:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} מטרים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "שטח מירבי לבקשה" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} קמ\"ר" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8379,9 +8751,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8389,5 +8761,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8397,23 +8769,23 @@ "באופן הגיוני הושמטו." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "שכבת נתונים {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "מחוץ לשטח שהורד" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "גירסה {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8422,5 +8794,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8434,5 +8806,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8445,11 +8817,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8458,36 +8830,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} מורכב מ-:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "גירסת API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "המר לשכבת GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8495,5 +8867,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8502,5 +8874,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8508,5 +8880,5 @@ msgstr[1] "נקודות" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8515,5 +8887,5 @@ msgstr[1] "מסלול בעל {0} נקודות" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8522,5 +8894,5 @@ msgstr[1] "{0} מורכב מ-{1} מסלולים" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8529,24 +8901,24 @@ msgstr[1] "{0} נקודות" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "קבצי GPX‏ (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "שגיאה בעת ניתוח {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "לא ניתן לקרוא את \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8555,34 +8927,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "זמן צילום (מ-EXIF)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "זמן GPS (נקרא מהצילום למעלה): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "אני באזור זמן: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "אין תאריך" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "פתח תמונה אחרת" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8590,69 +8962,155 @@ msgstr "שגיאה בזמן ניתוח התאריך:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "תאריך שגוי" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "עדכן מיקום עבור: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "אזור זמן: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "היסט:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "עדכן מיקום עבור: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "כל התמונות" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "תמונות ללא מיקום exif" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "תמונות שעדיין לא תויגו" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "כלום לא נבחר!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "אזור זמן שגוי" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "היסט שגוי" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8663,9 +9121,5 @@ "פורמט מצופה: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "אזור זמן שגוי" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8676,134 +9130,56 @@ "פורמט מצופה: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "היסט שגוי" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "מחלץ מיקומי GPS מ-EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "מתחיל סריקת ספרייה" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "קורא תמונות..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "קורא {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "לא יכול לקבל נתיב קנוני לתיקייה {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "קורא ספרייה {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "נמצא קובץ null בתיקייה {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "תמונות בעלות גאותגיות" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8811,52 +9187,99 @@ msgstr[1] "תמונות" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "לא ניתן למצוא את הקובץ." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "ללא תמונה" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "טוען {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "שגיאה בקובץ {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "הצג תמונות ללא תיוג גיאוגרפי" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "קודמת" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "תמונה קודמת" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "תצוגה: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "הסר תמונה משכבה" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "מחק מיחס" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "הבאה" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "תמונה הבאה" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "מרכז תצוגה" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8867,5 +9290,5 @@ "רום: {0} מ'" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8962,4 +9385,12 @@ msgid "Error displaying URL" msgstr "שגיאה בהצגת URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9172,7 +9603,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "" @@ -9241,6 +9671,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "אופניים" @@ -9625,31 +10055,90 @@ msgstr "לא ניתן להפעיל היטל {0}. משתמש במרקטור" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "אפשר שרת פרוקסי" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "אנונימי" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "בית חולים" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "פורט:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "סיסמא" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "הגדרות פרוקסי" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "מארח שרת פרוקסי" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "פורט שרת פרוקסי" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "שם משתמש שרת פרוקסי" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "סיסמת שרת פרוקסי" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "כתובת שרת הבסיס" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "סיסמת OSM" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9929,5 +10418,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9937,13 +10426,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9951,18 +10440,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "מאפייני רשות:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "סוג לא ידוע: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9973,16 +10462,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "שגיאה בניתוח {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -9991,18 +10480,18 @@ msgstr[1] "שנה {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "כלום לא נבחר!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "שנה תכונות" @@ -10031,4 +10520,11 @@ msgstr "מוריד נקודות {0} עד {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10044,12 +10540,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, כנראה שחסרים תגים." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "מכין נתונים..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "אינדקס טור לא צפוי. התקבל {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10150,16 +10701,16 @@ msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין." -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10169,40 +10720,40 @@ msgstr "מוריד מידע של OSM..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10210,10 +10761,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "מוריד נקודות {0} עד {1}..." -msgstr[1] "מוריד נקודות {0} עד {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10250,14 +10801,14 @@ msgstr "יבוא NMEA נכשל!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10266,16 +10817,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10283,66 +10834,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "מכין..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "מעלה..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "מכין נתונים..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "שנה עצם {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10368,4 +10930,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10377,5 +10949,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10402,5 +10974,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10408,5 +10980,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10419,5 +10991,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10428,57 +11000,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "סיסמא או שם משתמש שגויים." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "אזהרה: הסיסמא נשלחת בצורה לא מוצפנת." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "שמור את המשתמש והסיסמא (לא מוצפנים)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "הכנס סיסמא" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "התחברות" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "כתובת שרת הבסיס" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "סיסמת OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10568,5 +11089,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10575,38 +11103,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10614,19 +11142,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "עצם לא חוקי עם id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10636,8 +11164,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10647,25 +11175,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10673,5 +11217,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10680,5 +11224,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10686,5 +11230,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10693,13 +11237,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "מכין נתוני OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10722,21 +11266,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "מוריד משטח תמונה..." +msgstr[1] "מוריד משטח תמונה..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "מוריד נקודות {0} עד {1}..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10764,9 +11320,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10825,5 +11377,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10832,4 +11384,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +msgid "Unexpected id 0 for osm primitive found" msgstr "" @@ -10877,7 +11433,7 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "שגיאה במחיקת קובץ התוסף: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11015,9 +11571,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "אין תיאור זמין" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11149,4 +11705,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11436,6 +12007,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "" @@ -11521,5 +12092,5 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "" @@ -11530,5 +12101,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "" @@ -11543,11 +12114,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11558,24 +12126,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "מספר" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "טבעי" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "תמונה" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "השכרה" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11705,5 +12269,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11765,21 +12329,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "בחר מ..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11788,13 +12352,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11819,17 +12383,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11841,18 +12405,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "מקור" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11860,5 +12424,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11866,52 +12430,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12113,5 +12674,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "מיקום" @@ -12302,5 +12863,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "שום נתונים לא נטענו." @@ -12322,9 +12883,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12710,7 +13271,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "מים" @@ -12862,19 +13423,19 @@ msgstr "לא יכול להשיג תמונה" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "מתחבר" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "מחובר" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "לא מחובר" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "ההתחברות נכשלה" @@ -12913,32 +13474,32 @@ msgstr "שכבת LiveGPS" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "מרכז פעם אחת" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "מירכוז אוטומטי" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי באופן רצוף" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "" @@ -12989,9 +13550,9 @@ msgstr "לא יכול לצייר מחוץ לעולם" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "מצב מדידה" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "מדידות" @@ -13029,5 +13590,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13038,13 +13599,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13186,5 +13747,5 @@ msgstr "קובץ הרצת פיירפוקס" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13278,5 +13839,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13352,41 +13913,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "טען משטח" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "טען את כל המשטחים" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "הגדל" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "הקטן" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13555,4 +14116,42 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "רחובות" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "מספר נקודה" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13571,42 +14170,20 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "מדרג" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "שם רחוב" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13621,5 +14198,5 @@ msgstr "אין שגיאות תקינות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "שריג" @@ -14270,38 +14847,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "בניין" @@ -14315,5 +14862,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "שטח" @@ -14428,10 +14975,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15131,6 +15678,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "התייחסות" @@ -15576,5 +16123,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "" @@ -15692,5 +16239,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15702,5 +16249,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "" @@ -15958,4 +16505,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -15987,8 +16537,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "כן" @@ -16136,9 +16688,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "לא" @@ -16383,5 +16936,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "מגורים" @@ -16416,5 +16969,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "שירות" @@ -16448,6 +17001,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "בנייה" @@ -16497,5 +17050,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "כיכר" @@ -16683,6 +17236,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "צעידה" @@ -16803,5 +17356,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16827,4 +17379,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16834,15 +17387,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "מפעיל" @@ -17054,7 +17607,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "הגבהה" @@ -17473,5 +18026,5 @@ msgstr "אדמה בוצית" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17481,5 +18034,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "ביצה" @@ -18005,32 +18558,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "שעות פתיחה" @@ -18089,91 +18642,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18188,5 +18741,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18205,7 +18758,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "" @@ -18221,5 +18774,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "" @@ -18232,6 +18785,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "" @@ -18270,22 +18823,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "חנות" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "ערוך חנות רכב" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "תיקונים" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "ערוך תיקוני רכבים" @@ -18293,5 +18834,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "השכרה" @@ -18300,10 +18841,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "ערוך השכרת רכב" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "שיתוף" @@ -18311,5 +18852,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "ערוך שיתוף רכבים" @@ -18317,10 +18858,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "" @@ -18329,22 +18870,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "ערוך השכרת אופניים" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "ערוך חנות אופניים" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "תחבורה ציבורית" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18354,5 +18888,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18360,5 +18894,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18366,5 +18900,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -18372,5 +18906,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -18378,5 +18912,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -18385,5 +18919,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -18391,5 +18925,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -18398,5 +18932,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -18408,5 +18942,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18414,10 +18948,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "כניסת רכבת תחתית" @@ -18426,10 +18960,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "ערוך כניסת רכבת תחתית" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -18438,5 +18972,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "תחנת אוטובוס" @@ -18445,5 +18979,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "ערוך תחנת אוטובוס" @@ -18451,5 +18985,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "" @@ -18459,5 +18993,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "" @@ -18466,17 +19000,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "מקלט" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "ספסל" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "" @@ -18484,5 +19026,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "מונית" @@ -18490,5 +19032,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "ערוך תחנת מוניות" @@ -18496,5 +19038,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "שדה תעופה" @@ -18502,15 +19044,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "ערוך שדה תעופה" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "" @@ -18518,10 +19060,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "לינה" @@ -18533,5 +19075,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "מלון" @@ -18540,15 +19082,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "" @@ -18556,20 +19098,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "" @@ -18577,10 +19119,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "" @@ -18588,30 +19130,30 @@ #. item "Travel/Accomodation/Hostel" #. +#: build/trans_presets.java:1596 +msgid "Edit Hostel" +msgstr "" + +#. item "Travel/Accomodation/Hostel" text "Name" +#: build/trans_presets.java:1600 +msgid "Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" +#: build/trans_presets.java:1601 +msgid "Edit Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" text "Elevation" +#: build/trans_presets.java:1606 +msgid "Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" #: build/trans_presets.java:1607 -msgid "Edit Hostel" -msgstr "" - -#. item "Travel/Accomodation/Hostel" text "Name" +msgid "Edit Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" text "Name" #: build/trans_presets.java:1611 -msgid "Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 -msgid "Edit Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 -msgid "Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 -msgid "Edit Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 msgid "Camping Site" msgstr "" @@ -18619,10 +19161,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "מזון ושתיה" @@ -18633,5 +19175,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "מסעדה" @@ -18639,5 +19181,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "" @@ -18645,5 +19187,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "" @@ -18651,61 +19193,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "קבב" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "תורכי" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "אסייתי" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "תאילנדי" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "מקסיקני" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "יפני" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "מזון מהיר" @@ -18713,9 +19255,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "ערוך מסעדת מזון מהיר" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "בית קפה" @@ -18723,9 +19265,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "ערוך בית קפה" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "פאב" @@ -18733,18 +19275,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "ערוך פאב" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "בר" @@ -18752,9 +19294,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "ערוך בר" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "מועדון לילה" @@ -18762,24 +19304,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "ערוך מועדון לילה" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "תיירות" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "מוזיאון" @@ -18787,9 +19329,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "ערוך מוזיאון" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "גן חיות" @@ -18798,9 +19340,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "ערוך גן חיות" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "נקודת תצפית" @@ -18808,24 +19350,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "ערוך נקודת תצפית" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "מגדל תצפית" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "פארק שעשועים" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "ערוך פארק שעשועים" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "יצירת אומנות" @@ -18833,5 +19375,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "ערוך יצירת אומנות" @@ -18839,19 +19381,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "מפה" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18889,5 +19431,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18895,28 +19437,28 @@ msgstr "רחוב" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -18926,5 +19468,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18932,6 +19474,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "רכיבה" @@ -18939,5 +19481,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -18945,6 +19487,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "סקי" @@ -18952,5 +19494,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -18958,46 +19500,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "היסטוריה" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "טבע" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19005,29 +19547,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "ערוך מקלט" @@ -19035,25 +19577,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "אתר פיקניק" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "ערוך אתר פיקניק" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "מקומות היסטורים" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "טירה" @@ -19062,19 +19604,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "ערוך טירה" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "חורבות" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "ערוך חורבות" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "אתר ארכיאולוגי" @@ -19083,9 +19625,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "ערוך אתר ארכיאולוגי" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "שדה קרב" @@ -19093,10 +19635,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "ערוך שדה קרב" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19104,5 +19646,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19110,15 +19652,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "אנדרטה" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "ערוך אנדרטה" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "מצבת זיכרון" @@ -19126,55 +19668,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "ערוך מצבת זיכרון" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 msgid "Leisure" msgstr "פנאי" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "פארק מים" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "ערוך פארק מים" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "מגרש משחקים" @@ -19182,35 +19724,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "ערוך מגרש משחקים" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "דייג" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "ערוך דייג" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "מתקני ספורט" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "איצטדיון" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "ערוך איצטדיון" @@ -19224,6 +19766,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "בחר ענף ספורט:" @@ -19615,30 +20157,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "ספורט" @@ -19648,225 +20190,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "קשתות" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "אתלטיקה" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "כדורגל אוסטרלי" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "כדור בסיס" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "כדורסל" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "כדורת דשא" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "קנו" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "טיפוס" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "קריקט" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "מירוץ כלבים" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "כדורגל אמריקאי" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "גולף" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "התעמלות" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "הוקי" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "מירוץ סוסים" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "רוגבי" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "סקייטבורד" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "סקייטים" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "סקי" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "כדורגל" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "שחייה" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "טניס שולחן" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "טניס" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "מרכז ספורט" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "ערוך מרכז ספורט" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "מסלול מירוצים" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "ערוך מסלול מירוצים" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "מגרש גולף" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "ערוך מגרש גולף" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "מיני-גולף" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "ערוך מיני-גולף" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "ספורט" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -19905,21 +20447,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "סוג" @@ -19958,203 +20500,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "מרכז ספורט" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "איצטדיון" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "אתלטיקה" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "ערוך אתלטיקה" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "קשתות" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "ערוך קשתות" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "טיפוס" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "ערוך טיפוס" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "ערוך רכיבה" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "מירוץ כלבים" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "ערוך מירוץ כלבים" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "מירוץ סוסים" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "ערוך מירוץ סוסים" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "התעמלות" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "ערוך התעמלות" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "ספורט מוטורי" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "ערוך ספורט מוטורי" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "סקייטבורד" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "ערוך סקייטבורד" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "שחייה" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "ערוך שחייה" @@ -20162,56 +20704,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "ערוך סקי" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "סוג מסלול" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "גלישה במורד" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "פארק שלג" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "קושי" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "מתחילים" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "קל" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "מקצוענים" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "ירי" @@ -20219,182 +20761,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "ערוך ירי" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "ספורט (משחקי כדור)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "כדורגל" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "ערוך כדורגל" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "כדורגל אמריקאי" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "ערוך כדורגל אמריקאי" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "כדורגל אוסטרלי" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "ערוך כדורגל אוסטרלי" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "כדור בסיס" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "ערוך כדור בסיס" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "כדורסל" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "ערוך כדורסל" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "גולף" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "ערוך גולף" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "מגרש גולף" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "כדורת דשא" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "ערוך כדורת דשא" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "" #. item "Sport (Ball)/Cricket" +#: build/trans_presets.java:2092 +msgid "Edit Cricket" +msgstr "" + +#: build/trans_presets.java:2097 +msgid "Cricket Nets" +msgstr "" + +#. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + #: build/trans_presets.java:2103 -msgid "Edit Cricket" -msgstr "" - -#: build/trans_presets.java:2108 -msgid "Cricket Nets" -msgstr "" - -#. item "Sport (Ball)/Cricket Nets" +msgid "Croquet" +msgstr "" + +#. item "Sport (Ball)/Croquet" +#: build/trans_presets.java:2104 +msgid "Edit Croquet" +msgstr "" + #: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 -msgid "Croquet" -msgstr "" - -#. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 -msgid "Edit Croquet" -msgstr "" - -#: build/trans_presets.java:2120 msgid "Hockey" msgstr "הוקי" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "ערוך הוקי" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + +#: build/trans_presets.java:2121 +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 msgid "Rugby" msgstr "רוגבי" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "ערוך רוגבי" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "טניס שולחן" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "ערוך טניס שולחן" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "טניס" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "ערוך טניס" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "מבנים" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "מבנה" @@ -20402,5 +20944,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "מבנה ציבור" @@ -20408,10 +20950,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "ערוך מבנה ציבור" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "בניין העירייה" @@ -20419,10 +20961,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "ערוך בניין העירייה" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "שגרירות" @@ -20430,10 +20972,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "ערוך שגרירות" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "בית משפט" @@ -20442,10 +20984,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "ערוך בית משפט" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "כלא" @@ -20454,10 +20996,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "ערוך כלא" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "משטרה" @@ -20467,10 +21009,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "ערוך משטרה" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "תחנת מכבי אש" @@ -20479,10 +21021,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "ערוך תחנת מכבי אש" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "דואר" @@ -20490,5 +21032,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "ערוך דואר" @@ -20496,15 +21038,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "גן ילדים" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "ערוך גן ילדים" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "בית ספר" @@ -20512,10 +21054,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "ערוך בית ספר" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "אוניברסיטה" @@ -20523,10 +21065,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "ערוך אוניברסיטה" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "מכללה" @@ -20534,5 +21076,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "ערוך מכללה" @@ -20540,5 +21082,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "קולנוע" @@ -20547,10 +21089,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "ערוך קולנוע" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "ספרייה" @@ -20559,9 +21101,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "ערוך ספרייה" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "מרכז אומנויות" @@ -20569,10 +21111,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "ערוך מרכז אומנויות" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "תיאטרון" @@ -20581,10 +21123,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "ערוך תיאטרון" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "מקום תפילה" @@ -20594,5 +21136,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "ערוך מקום תפילה" @@ -20601,6 +21143,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "דת" @@ -20609,66 +21151,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "בהאי" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "בודהיסט" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "נוצרי" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "הינדי" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "יהודי" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "מוסלמי" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "סיקי" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "ספיריטואליסט" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "טאואיסט" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "" @@ -20677,81 +21219,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "אנגליקני" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "באפטיסט" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "קתולי" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "לותרני" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "מתודיסט" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "מורמוני" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "אורתודוקסי" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "פרוטסטנטי" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "שיעי" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "סוני" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "כתובות" @@ -20760,5 +21302,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "ערוך כתובת" @@ -20766,5 +21308,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "מספר בית" @@ -20772,20 +21314,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "שם בית" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "שם רחוב" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "שם עיר" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "מיקוד" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "קוד מדינה" @@ -20794,5 +21341,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "" @@ -20800,61 +21347,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "סכמת מספור" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "אי-זוגי" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "זוגי" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "מעשה אדם" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "מגדל" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "ערוך מגדל" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20862,25 +21409,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "מגדל מים" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "ערוך מגדל מים" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "מגדלור" @@ -20888,10 +21435,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "ערוך מגדלור" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "טחנת רוח" @@ -20899,10 +21446,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "ערוך טחנת רוח" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "צינור" @@ -20911,37 +21458,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "ערוך צינור" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "" @@ -20951,10 +21498,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "" @@ -20962,10 +21509,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "" @@ -20973,10 +21520,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "" @@ -20984,10 +21531,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "" @@ -20995,5 +21542,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "" @@ -21001,5 +21548,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "" @@ -21009,35 +21556,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "תחנת כח" @@ -21046,10 +21593,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "ערוך תחנת כח" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "" @@ -21058,5 +21605,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "" @@ -21064,10 +21611,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "עמוד חשמל" @@ -21078,23 +21625,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "ערוך עמוד חשמל" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "קו מתח" @@ -21103,75 +21650,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "ערוך קו מתח" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "שירותים" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "תיבת דואר" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "טלפון" @@ -21180,5 +21727,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "ערוך טלפון" @@ -21186,5 +21733,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "" @@ -21192,5 +21739,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "" @@ -21198,5 +21745,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21204,5 +21751,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "" @@ -21210,15 +21757,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "כרטיסי טלפון" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "" @@ -21227,5 +21774,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "ערוך תחנת מיחזור" @@ -21233,68 +21780,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "ספסל" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21365,39 +21907,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "ירוק" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "" @@ -21406,30 +21948,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "מזרקה" @@ -21438,10 +21980,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "ערוך מזרקה" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "מי שתיה" @@ -21450,10 +21992,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "ערוך מי שתיה" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21461,33 +22003,56 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "חנויות" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "ערוך חנות רכב" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +msgid "Bike Dealer" +msgstr "" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "ערוך חנות אופניים" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "סופרמרקט" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "ערוך סופרמרקט" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "מכולת" @@ -21495,9 +22060,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "ערוך מכולת" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "קיוסק" @@ -21505,27 +22070,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "ערוך קיוסק" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "מכונת ממכר" @@ -21533,5 +22098,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "ערוך מכונת ממכר" @@ -21539,88 +22104,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "כרטיסים לתחבורה ציבורית" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "מפות תחבורה ציבורית" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "כרטיסי חניה" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "מזון" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "משקאות" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "ממתקים" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "סיגריות" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "תמונות" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "מזון בע\"ח" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "עיתונים" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "צעצועים" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "בולים" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "כרטיס SIM" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "שוברי טלפון" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "שוברים" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "קונדומים" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "טמפונים" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "שקיות צואה" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "קצבייה" @@ -21628,9 +22193,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "ערוך קצבייה" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "מאפייה" @@ -21638,9 +22203,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "ערוך מאפייה" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "פרחים" @@ -21648,18 +22213,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "ערוך חנות פרחים" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "ערוך חנות אורגנית" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21667,54 +22232,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "ערוך חנות מחשבים" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "ערוך חנות אלקטרוניקה" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "ערוך חנות רהיטים" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "" @@ -21722,9 +22287,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21732,9 +22297,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "חנות עשה-זאת-בעצמך" @@ -21742,54 +22307,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "ערוך חנות עשה-זאת-בעצמך" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "מספרה" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "ערוך מספרה" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "ערוך חנות נעליים" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "ערוך חנות צעצועים" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "ערוך חנות וידאו" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "ניקוי יבש" @@ -21797,9 +22362,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "ערוך ניקוי יבש" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "מכבסה" @@ -21807,9 +22372,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "ערוך מכבסה" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "" @@ -21817,28 +22382,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "ערוך חנות ספורט" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "ערוך אופטיקאי" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "מזומן" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "בנק" @@ -21846,14 +22411,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "ערוך בנק" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "כספומט" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "החלפת כסף" @@ -21861,5 +22426,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "ערוך החלפת כסף" @@ -21867,15 +22432,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "ערוך כספומט" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "בריאות" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "רופאים" @@ -21883,18 +22448,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "ערוך רופאים" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "רופא שיניים" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "ערוך רופא שיניים" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "בית מרקחת" @@ -21902,5 +22467,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "ערוך בית מרקחת" @@ -21908,9 +22473,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "בית חולים" @@ -21918,10 +22483,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "ערוך בית חולים" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "נקודת גישה בחירום" @@ -21930,5 +22495,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "ערוך נקודת גישה בחירום" @@ -21937,20 +22502,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "מספר נקודה" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "מספר טלפון" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)" @@ -21958,5 +22523,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "וטרינרי" @@ -21965,64 +22530,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "ערוך וטרינרי" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "מקומות" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "יבשת" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "ערוך יבשת" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "ארץ" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "ערוך ארץ" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "מדינה" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "ערוך מדינה" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "אזור" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "ערוך אזור" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "מחוז" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "ערוך מחוז" @@ -22030,15 +22595,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "עיר" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "ערוך עיר" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "עיירה" @@ -22046,10 +22611,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "ערוך עיירה" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "פרבר" @@ -22057,25 +22622,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "ערוך פרבר" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "כפר" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "ערוך כפר" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "כפר קטן" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "ערוך כפר קטן" @@ -22083,5 +22648,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "מקומיות" @@ -22089,10 +22654,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "ערוך מקומיות" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "אי" @@ -22100,10 +22665,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "ערוך אי" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22111,5 +22676,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22117,5 +22682,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "פתח מערה" @@ -22123,10 +22688,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "ערוך פתח מערה" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "פסגה" @@ -22134,10 +22699,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "ערוך פסגה" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "קרחון" @@ -22145,10 +22710,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "ערוך קרחון" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "הר געש" @@ -22156,70 +22721,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "ערוך הר געש" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "גבולות" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "לאומי" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "ערוך גבול לאומי" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "מנהלי" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "ערוך גבול מנהלי" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "אזרחי" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "ערוך תחום אזרחי" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "פוליטי" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "ערוך תחום פוליטי" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "גן לאומי" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "ערוך תחום גן לאומי" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "עץ" @@ -22228,15 +22793,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "ערוך עץ" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "שם בוטני" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "חורש" @@ -22245,5 +22810,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "ערוך חורש" @@ -22251,17 +22816,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "מחטני" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "נשיר" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "מעורב" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "יער" @@ -22270,14 +22835,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "" @@ -22285,25 +22850,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22311,10 +22876,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "שדה-בור" @@ -22322,5 +22887,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "ערוך שדה-בור" @@ -22328,5 +22893,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "חצר משק" @@ -22335,45 +22900,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "אדמה חקלאית" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "כרם" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "" @@ -22381,25 +22946,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "דשא" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22407,10 +22972,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22418,20 +22983,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "" @@ -22439,5 +23004,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -22445,15 +23010,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "אזור מגורים" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "בית-קברות" @@ -22461,9 +23026,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "ערוך בית-קברות" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "בית עלמין" @@ -22471,39 +23036,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "קמעוני" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "מסחרי" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "תעשייתי" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "" @@ -22511,15 +23076,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "צבאי" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "" @@ -22527,55 +23092,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "אתר בניה" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "מחצבה" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "" @@ -22585,5 +23150,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "" @@ -22592,10 +23157,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "" @@ -22603,5 +23168,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22610,5 +23175,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22616,34 +23181,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "" @@ -22652,15 +23217,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "" @@ -22668,5 +23233,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22675,5 +23240,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22681,5 +23246,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22751,24 +23316,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "אופניים" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "אוטובוס" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22821,5 +23386,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22828,13 +23393,13 @@ msgstr "רגל" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -22848,10 +23413,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "רכבת תחתית" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -22859,31 +23424,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -22892,30 +23457,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23126,130 +23691,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23266,98 +23705,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "מיושן" @@ -23734,7 +24082,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23798,13 +24146,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23820,5 +24247,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23832,5 +24259,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23851,5 +24278,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "" @@ -23864,5 +24291,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23877,5 +24304,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "גדת נחל" @@ -23889,5 +24316,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "זרם" @@ -23901,5 +24328,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "" @@ -23921,16 +24348,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "אקוודוקט" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24027,4 +24442,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24093,13 +24515,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "מעשה אדם" @@ -24145,6 +24567,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24161,7 +24583,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24184,10 +24606,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24223,11 +24645,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24268,6 +24691,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24281,5 +24704,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "מסוף" @@ -24301,5 +24724,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24313,5 +24736,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24319,4 +24742,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24366,7 +24796,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "" @@ -24383,5 +24813,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "מסלול קל" @@ -24396,5 +24826,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "מסלול בינוניים" @@ -24409,5 +24839,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "מסלול מתקדמים" @@ -24422,5 +24852,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24435,5 +24865,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24448,5 +24878,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "מסלול מתחילים" @@ -24566,11 +24996,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "תחנת כח" @@ -24584,5 +25014,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "מזח" @@ -24596,5 +25026,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "צינור" @@ -24722,12 +25152,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "פנאי" @@ -24741,5 +25188,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "" @@ -24777,4 +25224,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24793,4 +25256,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24811,8 +25282,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -24914,10 +25387,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25171,5 +25644,5 @@ #. #. -#. +#. #. color health #. @@ -25315,4 +25788,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25332,23 +25813,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25380,6 +25861,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25440,14 +25921,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "בריאות" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25794,5 +26275,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25815,5 +26295,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "חנות" @@ -25885,8 +26366,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "מלון" @@ -25987,9 +26468,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "תיירות" @@ -26077,9 +26558,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "היסטורי" @@ -26093,5 +26574,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "מחצבה" @@ -26105,5 +26586,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26125,5 +26606,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "" @@ -26137,5 +26618,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "יער" @@ -26149,5 +26630,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26170,5 +26651,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "קמעוני" @@ -26182,5 +26663,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "תעשייתי" @@ -26194,5 +26675,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26206,5 +26687,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26218,5 +26699,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26273,7 +26754,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "צבאי" @@ -26287,5 +26768,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "בית עלמין" @@ -26298,5 +26779,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "פיסגה" @@ -26311,5 +26792,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "קרחון" @@ -26323,5 +26804,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "הר געש" @@ -26376,8 +26857,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "טבעי" @@ -26391,5 +26872,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "" @@ -26403,5 +26884,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "" @@ -26415,5 +26896,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26427,5 +26908,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "בוץ" @@ -26439,5 +26920,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "חוף" @@ -26515,8 +26996,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "" @@ -26564,7 +27045,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "גבול" @@ -26714,11 +27195,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "מקום" @@ -26766,6 +27247,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "כתובת" @@ -27121,31 +27602,115 @@ msgstr "" -#~ msgid "Images for {0}" -#~ msgstr "תמונות עבור {0}" - -#~ msgid "Read GPX..." -#~ msgstr "קורא GPX..." +#~ msgid "Expected closing parenthesis." +#~ msgstr "ציפיתי לסוגר סוגריים." + +#~ msgid "All images" +#~ msgstr "כל התמונות" + +#~ msgid "Images with no exif position" +#~ msgstr "תמונות ללא מיקום exif" + +#~ msgid "Not yet tagged images" +#~ msgstr "תמונות שעדיין לא תויגו" + +#~ msgid "Enable proxy server" +#~ msgstr "אפשר שרת פרוקסי" + +#~ msgid "Anonymous" +#~ msgstr "אנונימי" + +#~ msgid "Proxy server host" +#~ msgstr "מארח שרת פרוקסי" + +#~ msgid "Proxy server port" +#~ msgstr "פורט שרת פרוקסי" + +#~ msgid "Proxy server username" +#~ msgstr "שם משתמש שרת פרוקסי" + +#~ msgid "Proxy server password" +#~ msgstr "סיסמת שרת פרוקסי" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, כנראה שחסרים תגים." + +#~ msgid "Preparing..." +#~ msgstr "מכין..." + +#~ msgid "Uploading..." +#~ msgstr "מעלה..." + +#~ msgid "Incorrect password or username." +#~ msgstr "סיסמא או שם משתמש שגויים." + +#~ msgid "Enter Password" +#~ msgstr "הכנס סיסמא" + +#~ msgid "Login" +#~ msgstr "התחברות" + +#~ msgid "Shop" +#~ msgstr "חנות" + +#~ msgid "aqueduct" +#~ msgstr "אקוודוקט" + +#~ msgid "Move" +#~ msgstr "הזז" + +#~ msgid "Data Layer" +#~ msgstr "שכבת נתונים" + +#~ msgid "No data imported." +#~ msgstr "לא יובאו נתונים." + +#~ msgid "Select a bookmark first." +#~ msgstr "בחר סימניה תחילה." + +#~ msgid "No document open so nothing to save." +#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור." + +#~ msgid "Unknown file extension." +#~ msgstr "סיומת הקובץ אינה ידועה." + +#~ msgid "Email" +#~ msgstr "דוא\"ל" + +#~ msgid "Merging conflicts." +#~ msgstr "התנגשויות מתמזגות" + +#~ msgid "Resolve Conflicts" +#~ msgstr "פתור התנגשויות" + +#~ msgid "There were conflicts during import." +#~ msgstr "ארעו התנגשויות במהלך הייבוא." + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "לא נמצאו תמונות עם חותמות זמין קריאות." + +#~ msgid "GPS start: {0}" +#~ msgstr "התחלת GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "הפרש נוכחי: {0}ש'" + +#~ msgid "GPS end: {0}" +#~ msgstr "סיום GPS: {0}" #~ msgid "No time for point {0} x {1}" #~ msgstr "אין זמן לנקודה {0} x {1}" -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "לא נמצאו תמונות עם חותמות זמין קריאות." - -#~ msgid "GPS start: {0}" -#~ msgstr "התחלת GPS: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "סיום GPS: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "הפרש נוכחי: {0}ש'" - #~ msgid "timezone difference: " #~ msgstr "הפרש אזורי הזמן: " +#~ msgid "Image" +#~ msgstr "תמונה" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)" + #~ msgid "{0} within the track." #~ msgstr "{0} מתוך הרצועה." @@ -27160,54 +27725,6 @@ #~ msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"." -#~ msgid "Image" -#~ msgstr "תמונה" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "סנכרן את השעה עם יחידת ה-GPS" - #~ msgid "Time entered could not be parsed." #~ msgstr "לא ניתן לנתח את הזמן שהוזן." - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "פותח תמונות ב-AgPifoJ..." - -#~ msgid "Move" -#~ msgstr "הזז" - -#~ msgid "Data Layer" -#~ msgstr "שכבת נתונים" - -#~ msgid "No data imported." -#~ msgstr "לא יובאו נתונים." - -#~ msgid "Select a bookmark first." -#~ msgstr "בחר סימניה תחילה." - -#~ msgid "File could not be found." -#~ msgstr "לא ניתן למצוא את הקובץ." - -#~ msgid "No document open so nothing to save." -#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור." - -#~ msgid "Unknown file extension." -#~ msgstr "סיומת הקובץ אינה ידועה." - -#~ msgid "Email" -#~ msgstr "דוא\"ל" - -#~ msgid "Merging conflicts." -#~ msgstr "התנגשויות מתמזגות" - -#~ msgid "Resolve Conflicts" -#~ msgstr "פתור התנגשויות" - -#~ msgid "There were conflicts during import." -#~ msgstr "ארעו התנגשויות במהלך הייבוא." #~ msgid "Unsaved Changes" @@ -27347,4 +27864,10 @@ #~ msgstr "שם" +#~ msgid "Images for {0}" +#~ msgstr "תמונות עבור {0}" + +#~ msgid "Read GPX..." +#~ msgstr "קורא GPX..." + #~ msgid "OSM username (email)" #~ msgstr "שם משתמש OSM (אי-מייל)" @@ -27407,4 +27930,7 @@ #~ msgstr "שגיאה בבקשת עדכון" +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "פותח תמונות ב-AgPifoJ..." + #~ msgid "Please select some data" #~ msgstr "בחר נתונים" @@ -27421,4 +27947,7 @@ #~ msgid "Sorry, doesn't work with anonymous users" #~ msgstr "מצטער, לא עובד עם משתמשים אנונימיים" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)" #~ msgid "Login name (email) to the OSM account." @@ -27465,4 +27994,7 @@ #~ msgstr "בקש עדכון" +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "סנכרן את השעה עם יחידת ה-GPS" + #~ msgid "Public" #~ msgstr "ציבורי" @@ -27491,7 +28023,4 @@ #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "פתור {0} התנגשויות ב{1} עצמים" - -#~ msgid "Upload to OSM..." -#~ msgstr "העלה ל-OSM..." #~ msgid "History of Element" Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 19198) +++ /applications/editors/josm/i18n/po/is.po (revision 19199) @@ -4,9 +4,10 @@ # FIRST AUTHOR , 2008. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" "PO-Revision-Date: 2009-11-24 12:07+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Bý til aðal notandaviðmót" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hjálp" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,16 +95,7 @@ msgstr "Aðvörun" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" msgstr "" @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "Um JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -277,5 +279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -284,5 +286,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -291,15 +293,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Halda áfram" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -308,29 +315,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -347,5 +355,9 @@ msgstr "Hætta við" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -362,5 +374,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Sameina" @@ -378,15 +390,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Bæta við hnút..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Bæta við hnút með því að slá inn lengd og breidd" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -402,22 +414,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Breyti: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Sláðu inn hnit fyrir nýja hnútinn." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Nota tugabrotsgráður." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Neikvæð gildi tákna vestur- og suðurhvel." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -426,5 +438,5 @@ msgstr "Breiddargráða" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -433,28 +445,29 @@ msgstr "Lengdargráða" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -466,9 +479,9 @@ msgstr "Í lagi" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -489,18 +502,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -512,5 +525,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -532,6 +545,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -578,5 +591,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "árekstri" @@ -613,14 +626,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Loka opnum breytingarsettum" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Lokar opnum breytingarsettum" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -630,21 +644,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Skrá: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Þú átt engin opin breytingarsett" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Engin opin breytingarsett" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Sæki opin breytingarsett ..." @@ -729,11 +743,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -811,16 +826,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -856,5 +876,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Tvöfalda" @@ -897,10 +917,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Vista sem GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Vista gögnin í GPX sniði." @@ -915,12 +935,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -945,8 +965,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -957,10 +977,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -973,17 +993,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1020,22 +1040,27 @@ msgstr "Sýna upplýsingar um þennan hlut á OpenStreetMap vefnum" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1045,38 +1070,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1084,33 +1105,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Leysa árekstra" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1273,5 +1294,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "" @@ -1351,28 +1372,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Hornrétta form" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Færa hnúta á lokuðum vegi til svo öll horn séu 90 eða 270 gráður" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1381,9 +1402,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1392,16 +1413,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 -msgid "Usage" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 -msgid "Selected Elements cannot be orthogonalized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 msgid "Orthogonalize" msgstr "Hornrétta" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 +msgid "Usage" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 +msgid "Selected Elements cannot be orthogonalized" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1474,18 +1495,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Skipta um átt vega" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Skipta um átt allra valdra vega." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Skipta um átt vega" @@ -1494,10 +1515,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Vista" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Vista þau gögn sem sjást núna." @@ -1552,10 +1573,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Vista sem..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Vista þau gögn sem sjást núna í nýja skrá." @@ -1598,6 +1619,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1630,5 +1650,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1695,5 +1715,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1701,5 +1721,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1707,5 +1727,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1739,43 +1759,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +msgid "Select either:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 -msgid "Select either:" +msgid "* One tagged node, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 -msgid "* One tagged node, or" +msgid "* One node that is used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "* One node that is used by more than one way, or" +msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1785,9 +1805,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1795,5 +1815,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1828,10 +1848,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Uppfæra gögn" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "Uppfærir hluti í núverandi lagi frá þjóninum." @@ -1839,53 +1859,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Uppfæra val" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1894,5 +1910,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1900,131 +1916,7 @@ msgstr "Engar breytingar til að hlaða upp" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Ekkert til að upphala. Náðu í og breyttu einhverjum gögnum fyrst." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Hleð upp gögnum úr laginu „{0}“" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2159,9 +2051,9 @@ msgstr "Niðurhöluð GPX gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Sæki gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2169,5 +2061,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "Engin gögn fundust á þessu svæði." @@ -2238,7 +2130,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2253,58 +2145,52 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Teikna hnúta og vegi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Get ekki bætt við hnút handan endamarka veraldar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Bæta við hnút" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Bæta hnút við veg" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Bætti hnút við veg sem til var fyrir" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Búa til nýjan hnút." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2313,14 +2199,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "" @@ -2359,18 +2245,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Val" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Velja, færa og snúa hlutum" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2379,17 +2266,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Færa þá" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Ekki færa þá" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2399,22 +2286,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2424,5 +2311,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Þysja" @@ -2444,5 +2331,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Leita að hlutum." @@ -2537,7 +2424,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - Hlutir sem breytt hefur verið af gefnum notanda" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2546,8 +2432,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2555,35 +2451,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - Hlutum sem breytt hefur verið" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - Valdir hlutir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - Ókláraðir hlutir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - Hlutir án eiginda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "child segð - allir undirhlutir sem passa við segðina" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent segð - allir yfirhlutir sem passa við segðina" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Notaðu | eða OR t.d. „A | B“ til að leita að A eða B" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2591,11 +2493,11 @@ "„:“ eða „ “" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Notaðu ( og ) til að sameina segðir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2603,55 +2505,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Leit" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Hefja leit" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "stafsetursónæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2661,14 +2563,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2677,26 +2579,26 @@ "hnút, veg og vensl" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +msgid "Missing parameter for OR" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +msgid "Missing right parent" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +msgid "Missing operator for NOT" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2705,9 +2607,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2716,7 +2618,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2750,37 +2657,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Farið var umfram getu forritunarviðmótsins" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2892,5 +2791,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2905,5 +2804,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -3004,4 +2903,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3113,5 +3027,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3193,15 +3107,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3210,5 +3124,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3217,5 +3131,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3224,5 +3138,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3231,5 +3145,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3237,5 +3151,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3244,5 +3158,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3251,5 +3165,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3258,5 +3172,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3265,10 +3179,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3276,24 +3190,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Gat ekki hlaðið upp stillingunum. Ástæðan er: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3302,5 +3216,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3329,5 +3243,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3349,31 +3263,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "V" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "A" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Breytingarsett {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3381,5 +3288,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3390,27 +3297,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3418,5 +3325,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3428,5 +3335,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3434,25 +3341,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3460,43 +3367,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3504,5 +3423,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3530,10 +3449,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3541,7 +3456,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3556,5 +3471,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3572,146 +3487,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Óþekkt hlutverk \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Villa: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Viðvörun: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3720,6 +3627,6 @@ msgstr[1] "hnútar" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3728,7 +3635,8 @@ msgstr[1] "vegir" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3737,20 +3645,36 @@ msgstr[1] "vensl" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "ókláraður vegur" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "bakgrunnur" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" +msgstr "" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" msgstr "" @@ -3893,5 +3817,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "" @@ -3907,7 +3831,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3923,4 +3847,10 @@ msgstr[1] "{0} stök" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Breytingarsett {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3952,6 +3882,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Árekstrar" @@ -3965,7 +3895,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4044,74 +3974,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Notandanafn" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Lykilorð" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4120,9 +4050,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4130,36 +4060,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Virki uppfærðar viðbætur" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Hleð inn viðbótum" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Skrá" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4174,22 +4104,22 @@ msgstr "Breyta" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Sýn" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Tól" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Forstillingar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4197,5 +4127,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Hljóð" @@ -4274,13 +4204,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4313,5 +4244,5 @@ msgstr "Upphafsstilli" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4319,6 +4250,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4327,5 +4258,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4334,5 +4265,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4341,25 +4272,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4367,9 +4298,9 @@ msgstr "Hlutverk" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4401,11 +4332,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4414,6 +4345,6 @@ msgstr "Tögg" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4421,6 +4352,6 @@ msgstr "Hnútar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4428,40 +4359,40 @@ msgstr "Stök" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4469,21 +4400,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4515,22 +4446,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4538,5 +4469,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4544,30 +4475,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4575,5 +4506,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4581,14 +4512,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4596,5 +4527,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4602,23 +4533,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4629,27 +4560,27 @@ msgstr "Fjarlægja" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4658,5 +4589,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4665,5 +4596,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4672,5 +4603,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4679,5 +4610,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4686,5 +4617,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4694,5 +4625,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4927,10 +4858,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4940,10 +4871,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5028,9 +4959,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5038,6 +4969,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "" @@ -5126,7 +5057,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5136,6 +5067,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5243,4 +5174,58 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Eyða völdum hlutum." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Breytingarsett {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "Niðurhala lista yfir opin breytingarsett frá þjóninum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +#, fuzzy +msgid "Select all objects assigned to the currently selected changesets" +msgstr "Loka breytingarsettinu sem nú er valið" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Niðurhala" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Niðurhala kortagögnum frá OSM þjóninum." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Loka völdum breytingarsettum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Skoða notandasíðu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Opna ritil til að breyta völdum venslum" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5254,12 +5239,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5277,18 +5262,18 @@ msgstr "Skipanasaga: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Leysa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5296,25 +5281,25 @@ msgstr "Henda hlutum út úr vallistanum sem eru ekki valdir á honum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5326,26 +5311,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5356,41 +5341,41 @@ msgstr "Bæta við" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5429,5 +5414,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5442,34 +5427,34 @@ msgstr "Sýna lista yfir öll lög." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Eyða völdu lagi." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Sýna/Fela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Sýna eða fela valið lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Virkja valið lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Sameina þetta lag öðru lagi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Færa valið lag upp í röðinni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Færa valið lag niður í röðinni" @@ -5479,5 +5464,177 @@ msgstr "Upplýsingar um lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Vensl" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Sýna lista yfir vensl" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Vensl: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Opna ritil til að breyta völdum venslum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Eyða völdum venslum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Skapa ný vensl" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Núverandi val" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Opna vallistann." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Þysja að völdum hlut(um)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Þysja að vali" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Val: Hnútar:{2} / Vegir:{1} / Vensl:{0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Val" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Val: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Opna þessa stiku sem glugga" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Fjarlægja af stiku. Þú getur sett hlutinn aftur á stikuna með tökkunum í " +"vinstri tólastikunni." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Smelltu til að minnka/hámarka innihald stikunnar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Höfundar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Listi yfir notendur sem breyttu síðast völdum hlutum." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} notandi" +msgstr[1] "{0} notendur" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "Velja hluti sem þessi notandi hefur vistað" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "Sýna notandasíðu þessa notanda á openstreetmap.org" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Notandi" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "Fjöldi hluta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "óklárað" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "Loka" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Sæki breytingarsett ..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5486,22 +5643,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Breyta eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5510,5 +5667,5 @@ msgstr[1] "Breyta eigindum allt að {0} hluta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5517,228 +5674,71 @@ msgstr[1] "Allt að {0} hlutum verður breytt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Veldu lykil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Veldu gildi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Veldu hluti til að breyta eigindum þeirra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Eigindi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Eigindi valdra hluta." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Stak í" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Bæti vað eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "{0} eigindi & {1} vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Eigindi & vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Breyta venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Fjarlægja úr venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Eyða valinu úr venslunum {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Eyða völdum lykil í öllum völdum hlutum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Eyða eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Bæta nýjum eigindum við valda hluti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Breyta gildi valins lykils í öllum völdum hlutum" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Vensl" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Sýna lista yfir vensl" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Vensl: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Opna ritil til að breyta völdum venslum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Eyða völdum venslum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Skapa ný vensl" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Núverandi val" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Opna vallistann." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Þysja að völdum hlut(um)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Þysja að vali" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Val: Hnútar:{2} / Vegir:{1} / Vensl:{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Val" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Val: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Opna þessa stiku sem glugga" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Fjarlægja af stiku. Þú getur sett hlutinn aftur á stikuna með tökkunum í " -"vinstri tólastikunni." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Smelltu til að minnka/hámarka innihald stikunnar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Höfundar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Listi yfir notendur sem breyttu síðast völdum hlutum." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} notandi" -msgstr[1] "{0} notendur" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "Velja hluti sem þessi notandi hefur vistað" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Skoða notandasíðu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "Sýna notandasíðu þessa notanda á openstreetmap.org" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Notandi" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "Fjöldi hluta" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5802,19 +5802,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Hala niður öllum nóðum og vegum í þessum venslum" -msgstr[1] "Hala niður öllum nóðum og vegum í þessum venslum" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Opna slóð" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Sæki viðbótina {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -5832,14 +5831,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Vista hlutverk" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Bæta völdum stökum á vallistann" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5848,14 +5845,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5868,9 +5865,9 @@ "þennan hlut?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 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:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5880,15 +5877,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5896,5 +5893,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5902,20 +5899,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5924,69 +5921,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 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:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "Raða stöknum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" msgstr "Raða" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 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:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5995,9 +5992,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6006,48 +6003,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Bæta við tómu taggi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Hala niður öllum nóðum og vegum í þessum venslum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Niðurhala meðlimum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 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:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Vista hlutverk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6057,34 +6053,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 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/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6196,10 +6192,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6209,5 +6205,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6293,9 +6289,4 @@ msgid "Download Area" msgstr "Niðurhalssvæði" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Niðurhala" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6594,6 +6585,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6606,6 +6595,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6876,4 +6863,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7096,5 +7087,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7137,116 +7128,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Heiti" @@ -7270,15 +7261,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Gerð" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7449,10 +7440,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7460,5 +7451,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7466,9 +7457,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7583,6 +7574,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "óskilgreint" @@ -7604,13 +7595,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "Opna vafra með upplýsingum um þetta breytingarsett" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7645,4 +7636,116 @@ msgstr "Útgáfa" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7661,39 +7764,148 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Opna nýtt breytingarsett" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "Opna nýtt breytingarsett, gögnum verður bætt í það þegar þú hleður upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Uppfæri breytingarsett.." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Bæta gögnunum við breytingarsett sem er þegar opið á þjóninum" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "Loka breytingarsettinu eftir að breytingunni hefur verið halið upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" +"Sé þetta valið verður breytingarsettinu lokað þegar þú hleður upp " +"breytingunum. Ekki verður hægt að bæta frekari gögnum við það." + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "Niðurhala lista yfir opin breytingarsett frá þjóninum" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "Loka breytingarsettinu sem nú er valið" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "Veldu þau breytingarsett sem þú vilt loka" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "Opin breytingarsett" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Loka breytingarsettum" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "Loka völdum breytingarsettum" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Loka breytingarsetti" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "Loka breytingarsetti {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Vista notandanafn og lykilorð (ódulkóðað)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +msgid "Please enter the user name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Viðvörun: Lykilorðið er sent ódulkóðað" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +msgid "Authenticate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Breyta venslum" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "Velja skráarnafn" @@ -7760,17 +7972,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "Óvistaðar breytingar - Vista eða upphala áður en forritinu er lokað?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "Óvistaðar breytingar - Vista eða upphala áður en þú eyðir?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "Hleð upp og vista breyttum lögum ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7783,9 +7995,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7799,9 +8011,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7816,50 +8028,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Hunsa og hætta" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "Gleyma og eyða" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7867,5 +8079,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7938,40 +8150,382 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Stillingar" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "Tögg fyrir nýtt breytingarsett" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "Opna nýtt breytingarsett, gögnum verður bætt í það þegar þú hleður upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "Advanced" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Stillingar fyrir viðbætur." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Hleð upp gögnum úr laginu „{0}“" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Hlaða upp breytingum" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "Hlaða upp þessari breytingu" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "Hætta við að hala upp og halda áfrám að breyta" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Tögg á breytingarsetti #{0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Hleð upp gögnum úr laginu „{0}“" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "Halda áfrám ad hlaða upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Um JOSM..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Halda áfrám ad hlaða upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Veldu hluti til að hlaða upp" +msgstr[1] "Veldu hluti til að hlaða upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Breytingarsett {0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" +"Veldu hluti úr vallistanum til að hlaða upp á þjóninn." +"" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" +"Veldu hluti sem þú hefur eytt staðvært sem þú vilt " +"eyða á þjóninum." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "Veldu hluti til að hlaða upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "Hætta við að hlaða upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Veldu hlut til að eyða fyrst." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "Opna nýtt breytingarsett, gögnum verður bætt í það þegar þú hleður upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Hlutum sem verður bætt við:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Hlutum sem verður breytt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Hlutum sem verður eytt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7980,5 +8534,5 @@ msgstr[1] "{0} hlutum verður bætt við:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -7987,5 +8541,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -7994,215 +8548,37 @@ msgstr[1] "{0} hlutum verður eytt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Hlaða upp breytingum" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "Hlaða upp þessari breytingu" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Sláðu inn hnitin fyrst" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "Hætta við að hala upp og halda áfrám að breyta" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "Opna nýtt breytingarsett" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "Opna nýtt breytingarsett, gögnum verður bætt í það þegar þú hleður upp" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "Nota opið breytingarsett" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Bæta gögnunum við breytingarsett sem er þegar opið á þjóninum" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "Loka breytingarsettinu eftir að breytingunni hefur verið halið upp" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" -"Sé þetta valið verður breytingarsettinu lokað þegar þú hleður upp " -"breytingunum. Ekki verður hægt að bæta frekari gögnum við það." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Tögg á breytingarsetti #{0}" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "Niðurhala lista yfir opin breytingarsett frá þjóninum" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "Loka breytingarsettinu sem nú er valið" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" -"Veldu hluti úr vallistanum til að hlaða upp á þjóninn." -"" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" -"Veldu hluti sem þú hefur eytt staðvært sem þú vilt " -"eyða á þjóninum." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "Veldu hluti til að hlaða upp" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "Hætta við að hlaða upp" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "Halda áfrám ad hlaða upp" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Upphala öllum breytingunum í einni fyrirspurn" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Sláðu inn leitarstreng" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Sérsníða teikningu lína" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8210,5 +8586,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8217,5 +8593,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8297,5 +8673,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Lýsing" @@ -8327,10 +8703,10 @@ msgstr[1] "{0} punktar" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Breyta í gagnalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8338,12 +8714,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8352,29 +8728,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8383,9 +8759,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8393,5 +8769,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8399,23 +8775,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Gagnalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "útgáfa {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8424,5 +8800,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8436,5 +8812,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8447,11 +8823,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8460,36 +8836,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "Tölfræði um {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "API útgáfa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Breyta í GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8497,5 +8873,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8504,5 +8880,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8510,5 +8886,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8517,5 +8893,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8524,5 +8900,5 @@ msgstr[1] "{0} samanstendur af {1} ferlum" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8531,24 +8907,24 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX skrár (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8557,34 +8933,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8592,69 +8968,154 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +msgid "Override position for: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Ekkert er valið!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8663,9 +9124,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8674,134 +9131,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Les {0}..." +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 +#, java-format +msgid "Unable to get canonical path for directory {0}\n" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 +#, java-format +msgid "Scanning directory {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 -#, java-format -msgid "Scanning directory {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 -#, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8809,52 +9188,99 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Skrá fannst ekki." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Engin mynd" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Birtingarstillingar" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Fyrri" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Fyrri mynd" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Skrá: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Fjarlægja myndina úr laginu" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Fjarlægja úr venslum" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Næsta" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Næsta mynd" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8863,5 +9289,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8955,4 +9381,12 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "Error displaying URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" msgstr "" @@ -9166,7 +9600,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "" @@ -9235,6 +9668,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Hjól" @@ -9624,31 +10057,91 @@ msgstr "Ekki var hægt að virkja vörpunina „{0}“. Nota Meracator í staðin" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Nota milliþjón" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Nafnlaust" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Farfuglaheimili" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Raða" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Lykilorð" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Stillingar milliþjóns" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Nafn milliþjóns" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Port á milliþjóni" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Notandanafn á milliþjóni" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Lykilorð á milliþjóni" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "Notandanafn (eða netfang) á OSM þjóninum." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Lykilorð á OSM þjóninum. Hafðu þetta óútfyllt til að vista ekki lykilorðið." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Slóð OSM þjóns" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "OSM notandanafn (netfang)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM lykilorð" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9928,5 +10421,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9936,13 +10429,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "Bæta við nýju taggi" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "Eyða völdum hlutum úr listanum yfir tögg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9950,18 +10443,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Valfrjáls eigind:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9972,16 +10465,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -9990,18 +10483,18 @@ msgstr[1] "Breyta {0} hlutum" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Ekkert er valið!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Val óhæfilegt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Vista forstillingu" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Breyta eigindum" @@ -10030,4 +10523,11 @@ msgstr "Hala niður punktum {0} til {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10043,12 +10543,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "Tómur bendill, hugsanvega vantar einhver eigindi." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Undirbý gögn..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10147,16 +10702,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10166,40 +10721,40 @@ msgstr "Hala niður OSM gögnum..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10207,10 +10762,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Hala niður punktum {0} til {1}..." -msgstr[1] "Hala niður punktum {0} til {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10247,14 +10802,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10263,16 +10818,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10280,66 +10835,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "Bý til breytingarsett..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Opnaði breytingarsett {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Uppfæri breytingarsett.." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "Uppfæri breytingarsett {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Loka breytingasetti..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Undirbý..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Hleð upp gögnum..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Undirbý gögn..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Breyta {0} hlut" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10365,4 +10931,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10374,5 +10950,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10399,5 +10975,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10405,5 +10981,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10416,5 +10992,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10425,58 +11001,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Rangt lykilorð eða notandanafn" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Viðvörun: Lykilorðið er sent ódulkóðað" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Vista notandanafn og lykilorð (ódulkóðað)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Sláðu inn lykilorð" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Innskrá" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "Notandanafn (eða netfang) á OSM þjóninum." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Lykilorð á OSM þjóninum. Hafðu þetta óútfyllt til að vista ekki lykilorðið." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Slóð OSM þjóns" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "OSM notandanafn (netfang)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM lykilorð" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10566,5 +11090,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10573,38 +11104,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10612,19 +11143,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Ógildur hlutur með kenni=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10634,8 +11165,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10645,25 +11176,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10671,5 +11218,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10678,5 +11225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10684,5 +11231,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10691,13 +11238,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Undirbý OSM gögn..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "Undirbý gögn..." @@ -10720,21 +11267,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "Les breytingarsett" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "Sæki breytingarsett ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Sæki breytingarsett ..." +msgstr[1] "Sæki breytingarsett ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Sæki breytingarsett ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10762,9 +11321,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10824,5 +11379,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10832,4 +11387,8 @@ msgid "Uploading data ..." msgstr "Hleð upp gögnum ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +msgid "Unexpected id 0 for osm primitive found" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10871,7 +11430,7 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Sæki viðbótina {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 @@ -11014,9 +11573,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Frekari upplýsingar" @@ -11148,4 +11707,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11435,6 +12009,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Upphala ferlum" @@ -11520,5 +12094,5 @@ msgstr "Hleð upp GPX ferli" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "" @@ -11529,5 +12103,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "" @@ -11542,11 +12116,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11557,7 +12128,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Tilvísun" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position @@ -11568,12 +12138,10 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "Fylki" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Leiga" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11703,5 +12271,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11763,21 +12331,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11786,13 +12354,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11817,17 +12385,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11839,18 +12407,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11858,5 +12426,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11864,52 +12432,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12111,5 +12676,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12300,5 +12865,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Engin göng eru hlaðin til að vinna með." @@ -12320,9 +12885,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12708,7 +13273,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "vatn" @@ -12857,19 +13422,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "" @@ -12908,32 +13473,32 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 +msgid "Capture GPS Track" +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +msgid "Connect to gpsd server and show current position in LiveGPS layer." +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 +msgid "Center Once" +msgstr "" + #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 -msgid "Capture GPS Track" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -msgid "Connect to gpsd server and show current position in LiveGPS layer." -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 -msgid "Center Once" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 msgid "Center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "" @@ -12984,9 +13549,9 @@ msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "Mælihamur" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Mælingar" @@ -13024,5 +13589,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13033,13 +13598,13 @@ msgstr "Búa til marghyrning." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13180,5 +13745,5 @@ msgstr "" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13270,5 +13835,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13344,41 +13909,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Gagnvirkt kort" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13547,4 +14112,41 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Stræti" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +msgid " is not a number" +msgstr "" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13563,41 +14165,19 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Nafn götu" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" msgstr "" @@ -13613,5 +14193,5 @@ msgstr "Engar villur fundust við athugun" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "" @@ -14258,38 +14838,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "bygging" @@ -14303,5 +14853,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "" @@ -14416,10 +14966,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15117,6 +15667,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Tilvísun" @@ -15562,5 +16112,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Breidd (í metrum)" @@ -15678,5 +16228,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15688,5 +16238,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "skógur" @@ -15944,4 +16494,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -15973,8 +16526,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "já" @@ -16122,9 +16677,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "nei" @@ -16369,5 +16925,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "íbúðargata" @@ -16402,5 +16958,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "þjónustuvegur" @@ -16434,6 +16990,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "byggingarsvæði" @@ -16483,5 +17039,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "hringtorg" @@ -16669,6 +17225,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "" @@ -16789,5 +17345,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16813,4 +17368,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16820,15 +17376,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Rekstraraðili" @@ -17040,7 +17596,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Hæð (y/s)" @@ -17459,5 +18015,5 @@ msgstr "" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17467,5 +18023,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "" @@ -17991,32 +18547,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Opnunartími" @@ -18075,91 +18631,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18174,5 +18730,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18191,7 +18747,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Tilvísun" @@ -18207,5 +18763,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "" @@ -18218,6 +18774,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "" @@ -18256,22 +18812,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Búð" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Breyti bílabúð" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "" @@ -18279,5 +18823,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Leiga" @@ -18286,10 +18830,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Breyti bílaleigu" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "" @@ -18297,5 +18841,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "" @@ -18303,10 +18847,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Breyti hjólastæði" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "" @@ -18315,22 +18859,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Breyti hjólaleigu" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Breyti hjólabúð" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Almenningssamgöngur" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18340,5 +18877,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18346,5 +18883,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Tilvísun" @@ -18352,5 +18889,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -18358,5 +18895,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -18364,5 +18901,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -18371,5 +18908,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -18377,5 +18914,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -18384,5 +18921,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -18394,5 +18931,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18400,10 +18937,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "" @@ -18412,10 +18949,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -18424,5 +18961,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Strætóstöð" @@ -18431,5 +18968,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Breyti strætóstöð" @@ -18437,5 +18974,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Strætóstopp" @@ -18445,5 +18982,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Breyti strætóstoppi" @@ -18452,17 +18989,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Skýli" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Bekkur" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "" @@ -18470,5 +19015,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Leigubílastöð" @@ -18476,5 +19021,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Breyti leigubílastöð" @@ -18482,5 +19027,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Flugvöllur" @@ -18488,15 +19033,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Breyti flugvelli" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "" @@ -18504,10 +19049,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Ferðamennska" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Gisting" @@ -18519,5 +19064,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hótel" @@ -18526,15 +19071,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Breyti hóteli" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Stjörnur" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Vegahótel" @@ -18542,20 +19087,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Breyti vegahóteli" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Gistiheimili" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Breyti gistiheimili" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Fjallakofi (e. Chalet)" @@ -18563,10 +19108,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Farfuglaheimili" @@ -18574,30 +19119,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Breyti farfuglaheimili" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Húsbílastæði" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Breyti húsbílastæði" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Tjaldstæði" @@ -18605,10 +19150,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Breyti tjaldstæði" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Matur & Drykkur" @@ -18619,5 +19164,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Veitingastaður" @@ -18625,5 +19170,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Breyti veitingastað" @@ -18631,5 +19176,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Matargerð" @@ -18637,61 +19182,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "ítölsk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "kínversk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamborgarar" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "grísk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "þýsk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indversk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "að hætti heimamanna" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "tyrknesk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asísk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "tælensk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexíkósk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japönsk" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Skyndibiti" @@ -18699,9 +19244,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Breyti skyndibitastað" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Kaffihús" @@ -18709,9 +19254,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Breyti kaffihúsi" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Bar" @@ -18719,18 +19264,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Breyti bar" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Bjórgarður (þ. Biergarten)" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Breyti bjórgarði (þýska: Biergarten)" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "" @@ -18738,9 +19283,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Næturklúbbur" @@ -18748,24 +19293,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Breyti næturklúbb" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Ferðamennska" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Safn" @@ -18773,9 +19318,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Breyti safni" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Dýragarður" @@ -18784,9 +19329,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Breyti dýragarð" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Útsýnisstaður" @@ -18794,24 +19339,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Breyti útsýnisstað" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Skemmtigarður" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Breyti skemmtigarð" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Listaverk" @@ -18819,5 +19364,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Breyti listaverki" @@ -18825,19 +19370,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Upplýsingamiðstöð" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Kort" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18875,5 +19420,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18881,28 +19426,28 @@ msgstr "stræti" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Nánari lýsing" @@ -18912,5 +19457,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18918,6 +19463,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "" @@ -18925,5 +19470,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -18931,6 +19476,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Skíði" @@ -18938,5 +19483,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -18944,46 +19489,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Fræðsluskilti" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "sagnfræði" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "náttúran" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "dýralíf" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -18991,29 +19536,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "Breyti skýli" @@ -19021,25 +19566,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Eldstæði" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Sögustaðir" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Kastali" @@ -19048,19 +19593,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Breyti kastala" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Rústir" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Breyti rústum" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Fornleifasvæði" @@ -19069,9 +19614,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Breyti fornleifasvæði" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Vígvöllur" @@ -19079,10 +19624,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Breyti vígvelli" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19090,5 +19635,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19096,15 +19641,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Minnismerki" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Breyti minnismerki" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Minnisvarði" @@ -19112,55 +19657,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Breyti minnisvarða" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 msgid "Leisure" msgstr "Frístundir" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Vatnsleikjagarður" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Breyti vatnsleikjagarð" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Leikvöllur" @@ -19168,35 +19713,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Breyti leikvöll" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Fiskveiðar" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Breyti fiskveiðum" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Íþróttir" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Íþróttamannvirki" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Íþróttaleikvangur" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Breyti íþróttaleikvang" @@ -19210,6 +19755,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "veldu íþrótt:" @@ -19601,30 +20146,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "íþrótt" @@ -19634,225 +20179,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "bogfimi" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "ástralskur fótbolti" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "hafnabolti" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "körfubolti" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "klifur" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "fótbolti" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hokkí" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "skotfimi" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "skautar" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "skíði" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "fótbolti" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "sund" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "borðtennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Íþróttamiðstöð" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Breyti íþróttamiðstöð" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Völlur" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Breyti velli" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfvöllur" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Breyti golfvelli" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Íþróttir" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -19891,21 +20436,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "gerð" @@ -19944,203 +20489,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "völlur" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "íþróttamiðstöð" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "íþróttaleikvangur" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" +#: build/trans_presets.java:1942 +msgid "Edit 10pin" +msgstr "" + +#: build/trans_presets.java:1947 +msgid "Athletics" +msgstr "" + +#. item "Sport/Athletics" +#: build/trans_presets.java:1948 +msgid "Edit Athletics" +msgstr "" + #: build/trans_presets.java:1953 -msgid "Edit 10pin" -msgstr "" - -#: build/trans_presets.java:1958 -msgid "Athletics" -msgstr "" - -#. item "Sport/Athletics" -#: build/trans_presets.java:1959 -msgid "Edit Athletics" -msgstr "" - -#: build/trans_presets.java:1964 msgid "Archery" msgstr "Bogfimi" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Breyti bogfimi" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Klifur" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Breyti klifri" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" +#: build/trans_presets.java:1966 +msgid "Edit Canoeing" +msgstr "" + +#. item "Sport/Cycling" +#: build/trans_presets.java:1972 +msgid "Edit Cycling" +msgstr "" + #: build/trans_presets.java:1977 -msgid "Edit Canoeing" -msgstr "" - -#. item "Sport/Cycling" +msgid "Dog Racing" +msgstr "" + +#. item "Sport/Dog Racing" +#: build/trans_presets.java:1978 +msgid "Edit Dog Racing" +msgstr "" + #: build/trans_presets.java:1983 -msgid "Edit Cycling" -msgstr "" - -#: build/trans_presets.java:1988 -msgid "Dog Racing" -msgstr "" - -#. item "Sport/Dog Racing" +msgid "Equestrian" +msgstr "" + +#. item "Sport/Equestrian" +#: build/trans_presets.java:1984 +msgid "Edit Equestrian" +msgstr "" + #: build/trans_presets.java:1989 -msgid "Edit Dog Racing" -msgstr "" - -#: build/trans_presets.java:1994 -msgid "Equestrian" -msgstr "" - -#. item "Sport/Equestrian" +msgid "Horse Racing" +msgstr "" + +#. item "Sport/Horse Racing" +#: build/trans_presets.java:1990 +msgid "Edit Horse Racing" +msgstr "" + #: build/trans_presets.java:1995 -msgid "Edit Equestrian" -msgstr "" - -#: build/trans_presets.java:2000 -msgid "Horse Racing" -msgstr "" - -#. item "Sport/Horse Racing" +msgid "Gymnastics" +msgstr "" + +#. item "Sport/Gymnastics" +#: build/trans_presets.java:1996 +msgid "Edit Gymnastics" +msgstr "" + #: build/trans_presets.java:2001 -msgid "Edit Horse Racing" -msgstr "" - -#: build/trans_presets.java:2006 -msgid "Gymnastics" -msgstr "" - -#. item "Sport/Gymnastics" +msgid "Motor Sports" +msgstr "" + +#. item "Sport/Motor Sports" +#: build/trans_presets.java:2002 +msgid "Edit Motor Sports" +msgstr "" + #: build/trans_presets.java:2007 -msgid "Edit Gymnastics" -msgstr "" - -#: build/trans_presets.java:2012 -msgid "Motor Sports" -msgstr "" - -#. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 -msgid "Edit Motor Sports" -msgstr "" - -#: build/trans_presets.java:2018 msgid "Skating" msgstr "Skautar" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Breyti skautum" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Sund" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Breyti sundi" @@ -20148,56 +20693,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Breyti skíðasvæði" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Skotfimi" @@ -20205,182 +20750,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Breyti skotfimi" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Boltaíþróttir" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Fótbolti" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Breyti fótbolta" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Amerískur fótbolti" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Breyti Amerískum fótbolta" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Ástralskur fótbolti" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Breyti Áströlskum fótbolta" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Hafnabolti" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Breyti hafnabolta" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Körfubolti" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Breyti körfubolta" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "" #. item "Sport (Ball)/Golf" +#: build/trans_presets.java:2074 +msgid "Edit Golf" +msgstr "" + +#. item "Sport (Ball)/Golf" combo "type" +#: build/trans_presets.java:2077 +msgid "golf_course" +msgstr "" + +#: build/trans_presets.java:2079 +msgid "Boule" +msgstr "" + +#. item "Sport (Ball)/Boule" +#: build/trans_presets.java:2080 +msgid "Edit Boule" +msgstr "" + #: build/trans_presets.java:2085 -msgid "Edit Golf" -msgstr "" - -#. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 -msgid "golf_course" -msgstr "" - -#: build/trans_presets.java:2090 -msgid "Boule" -msgstr "" - -#. item "Sport (Ball)/Boule" +msgid "Bowls" +msgstr "" + +#. item "Sport (Ball)/Bowls" +#: build/trans_presets.java:2086 +msgid "Edit Bowls" +msgstr "" + #: build/trans_presets.java:2091 -msgid "Edit Boule" -msgstr "" - -#: build/trans_presets.java:2096 -msgid "Bowls" -msgstr "" - -#. item "Sport (Ball)/Bowls" +msgid "Cricket" +msgstr "" + +#. item "Sport (Ball)/Cricket" +#: build/trans_presets.java:2092 +msgid "Edit Cricket" +msgstr "" + #: build/trans_presets.java:2097 -msgid "Edit Bowls" -msgstr "" - -#: build/trans_presets.java:2102 -msgid "Cricket" -msgstr "" - -#. item "Sport (Ball)/Cricket" +msgid "Cricket Nets" +msgstr "" + +#. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + #: build/trans_presets.java:2103 -msgid "Edit Cricket" -msgstr "" - -#: build/trans_presets.java:2108 -msgid "Cricket Nets" -msgstr "" - -#. item "Sport (Ball)/Cricket Nets" +msgid "Croquet" +msgstr "" + +#. item "Sport (Ball)/Croquet" +#: build/trans_presets.java:2104 +msgid "Edit Croquet" +msgstr "" + #: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 -msgid "Croquet" -msgstr "" - -#. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 -msgid "Edit Croquet" -msgstr "" - -#: build/trans_presets.java:2120 msgid "Hockey" msgstr "Hokkí" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Breyti hokkí" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + +#: build/trans_presets.java:2121 +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" +msgid "Rugby" +msgstr "" + +#. item "Sport (Ball)/Rugby" +#: build/trans_presets.java:2128 +msgid "Edit Rugby" +msgstr "" + #: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2144 msgid "Table Tennis" msgstr "Borðtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Breyti borðtennis" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Breyti tennis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "Mannvirki" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Byggingar" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Bygging" @@ -20388,5 +20933,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Opinber bygging" @@ -20394,10 +20939,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Breyti opinberri byggingu" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Ráðhús" @@ -20405,10 +20950,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Breyti ráðhúsi" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Sendiráð" @@ -20416,10 +20961,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Breyti sendiráði" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Dómshús" @@ -20428,10 +20973,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Breyti dómshúsi" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Fangelsi" @@ -20440,10 +20985,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Breyti fangelsi" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Lögreglustöð" @@ -20453,10 +20998,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Breyti lögreglustöð" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Slökkvistöð" @@ -20465,10 +21010,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Breyti slökkvistöð" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Pósthús" @@ -20476,5 +21021,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Breyti pósthúsi" @@ -20482,15 +21027,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Leikskóli" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Breyti leikskóla" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Skóli" @@ -20498,10 +21043,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Breyti skóla" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Háskóli" @@ -20509,10 +21054,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Breyti háskóla" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Menntaskóli" @@ -20520,5 +21065,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Breyti menntaskóla" @@ -20526,5 +21071,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Kvikmyndahús" @@ -20533,10 +21078,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Breyti kvikmyndahúsi" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Bókasafn" @@ -20545,9 +21090,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Breyti bókasafni" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Listamiðstöð" @@ -20555,10 +21100,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Breyti listamiðstöð" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Leikhús" @@ -20567,10 +21112,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Breyti leikhúsi" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Helgistaður" @@ -20580,5 +21125,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Breyti helgistað" @@ -20587,6 +21132,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "" @@ -20595,66 +21140,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "" @@ -20663,81 +21208,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Heimilisfang" @@ -20746,5 +21291,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Breyti heimilisfangi" @@ -20752,5 +21297,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Húsnúmer" @@ -20758,20 +21303,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Nafn húss" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Nafn götu" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Nafn bæjar" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Póstnúmer" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Landskóði" @@ -20780,5 +21330,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "" @@ -20786,61 +21336,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Mannvirki" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Turn" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Breyti turni" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20848,25 +21398,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Vatnsturn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Breyti vatnsturni" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Viti" @@ -20874,10 +21424,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Breyti vita" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Vindmylla" @@ -20885,10 +21435,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Breyti vindmyllu" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Leiðsla" @@ -20897,37 +21447,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Breyti leiðslu" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "" @@ -20937,10 +21487,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Krani" @@ -20948,10 +21498,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Breyti krana" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "" @@ -20959,10 +21509,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "" @@ -20970,10 +21520,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Eftirlitsmyndavél" @@ -20981,5 +21531,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Breyti eftirlitsmyndavél" @@ -20987,5 +21537,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Rafall" @@ -20995,35 +21545,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Breyti rafli" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Orkuver" @@ -21032,10 +21582,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Breyti orkuveri" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Spennustöð" @@ -21044,5 +21594,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Breyti spennustöð" @@ -21050,10 +21600,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Tilvísunarnúmer línunnar" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Háspennustaur" @@ -21064,23 +21614,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Breyti háspennustaur" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Raflína" @@ -21089,75 +21639,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Breyti raflínu" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Volt" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Salerni" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Athugasemd" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Póstkassi" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Almenningssími" @@ -21166,5 +21716,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Breyti almenningssíma" @@ -21172,5 +21722,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Mynt" @@ -21178,5 +21728,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Athugasemd" @@ -21184,5 +21734,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21190,5 +21740,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Debetkort" @@ -21196,15 +21746,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Símakort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Endurvinnsla" @@ -21213,5 +21763,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Breyti endurvinnslustöð" @@ -21219,68 +21769,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Rafhlöður" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Dósir" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Föt" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Gler" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Pappír" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Brotajárn" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Bekkur" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21351,39 +21896,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "" @@ -21392,30 +21937,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Hæð" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Gosbrunnur" @@ -21424,10 +21969,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Breyti gosbrunn" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Drykkjarvatn" @@ -21436,10 +21981,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Breyti drykkjarvatni" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Barnalúga" @@ -21447,33 +21992,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Breyti barnalúgu" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Verslanir" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Breyti bílabúð" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Rekja vatn" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Breyti hjólabúð" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "" @@ -21481,9 +22050,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Sjoppa" @@ -21491,27 +22060,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Breyti sjoppu" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Ferðaskrifstofa" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Breyti ferðaskrifstofu" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Sjálfsali" @@ -21519,5 +22088,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "" @@ -21525,88 +22094,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "dagblöð" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "dót" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Slátrari" @@ -21614,9 +22183,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Breyti slátrara" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Bakarí" @@ -21624,9 +22193,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Breyti bakaríi" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Blómabúð" @@ -21634,18 +22203,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Breyti blómabúð" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Lífræn búð" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Breyti lífrænni búð" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21653,54 +22222,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Vínbúð" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Tölvubúð" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Breyti tölvubúð" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Raftækjabúð" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Breyti raftækjabúð" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hljómtækjaverslun" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Breyti hljómtækjaverslun" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Húsgagnaverslun" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Breyti húsgagnaverslun" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "" @@ -21708,9 +22277,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21718,9 +22287,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "" @@ -21728,54 +22297,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Skrifstofuvörur" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Breyti skrifstofuvörum" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Hársnyrtir" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Breyti hársnyrti" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Skóbúð" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Breyti skóbúð" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Dótabúð" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Breyti dótabúð" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Efnalaug" @@ -21783,9 +22352,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Breyti efnalaug" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Þvottahús" @@ -21793,9 +22362,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Breyti þvottahúsi" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Útivistarbúð" @@ -21803,28 +22372,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Breyti útivistarbúð" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Breyti sjóntækjasmið" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Fjármál" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banki" @@ -21832,14 +22401,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Breyti banka" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Hraðbanki" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Gjaldeyrisskipti" @@ -21847,5 +22416,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Breyti gjaldeyrisskiptum" @@ -21853,15 +22422,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Breyti hraðbanka" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Heilsa" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Læknir" @@ -21869,18 +22438,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Breyti lækni" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Tannlæknir" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Breyti tannlækni" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Apótek" @@ -21888,5 +22457,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Apótek" @@ -21894,9 +22463,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Spítali" @@ -21904,10 +22473,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Breyti spítala" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -21916,5 +22485,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -21923,20 +22492,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -21944,5 +22513,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Dýralæknir" @@ -21951,64 +22520,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Breyti dýralækni" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "Landafræði" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Staðir" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Heimsálfa" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Breyti heimsálfu" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Breyti landi" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Fylki" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Breyti fylki" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Svæði" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Breyti svæði" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Sýsla" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Breyti sýslu" @@ -22016,15 +22585,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Borg" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Breyti borg" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Bær" @@ -22032,10 +22601,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Breyti bæ" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Hverfi" @@ -22043,25 +22612,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Breyti hverfi" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Þorp" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Breyti þorpi" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Smáþorp" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Breyti smáþorpi" @@ -22069,5 +22638,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "" @@ -22075,10 +22644,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Eyja" @@ -22086,10 +22655,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Breyti eyju" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22097,5 +22666,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22103,5 +22672,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Hellismunni" @@ -22109,10 +22678,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Breyti hellismunna" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Tindur" @@ -22120,10 +22689,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Breyti tind" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Jökull" @@ -22131,10 +22700,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Breyti jökli" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Eldfjall" @@ -22142,70 +22711,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Breyti eldfjalli" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Landamæri" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Breyti landamærum þjóðgarðs" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Landnýting" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Tré" @@ -22214,15 +22783,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Breyti tré" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Fræðiheiti" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Skógur" @@ -22231,5 +22800,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Breyti skóg" @@ -22237,17 +22806,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "barrskógur" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "laufskógur" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "blandaður" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Skógur (ræktaður)" @@ -22256,14 +22825,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Breyti ræktuðum skóg" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "" @@ -22271,25 +22840,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22297,10 +22866,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "" @@ -22308,5 +22877,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "" @@ -22314,5 +22883,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "" @@ -22321,45 +22890,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "" @@ -22367,25 +22936,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Garður" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Breyti garði" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22393,10 +22962,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22404,20 +22973,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Almenningsgarður" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Breyti almenningsgarð" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "" @@ -22425,5 +22994,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -22431,15 +23000,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Íbúðarsvæði" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Breyti íbúðarlandnýtingu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Grafreitur" @@ -22447,9 +23016,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Breyti grafreit" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "" @@ -22457,39 +23026,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Breyti kirkjugarðslandnýtingu" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Smásala" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Breyti smásölulandnýtingu" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Skrifstofur" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Breyti skrifstofulandnýtingu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Iðnaður" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Breyti iðnaðarlandnýtingu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "" @@ -22497,15 +23066,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "" @@ -22513,55 +23082,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Byggingarsvæði" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Breyti byggingarsvæðislandnýtingu" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Marghyrningur" @@ -22571,5 +23140,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Breyta marghyrningi" @@ -22578,10 +23147,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "" @@ -22589,5 +23158,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Beygjutakmörkun" @@ -22596,5 +23165,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Breyti beygjutakmörkun" @@ -22602,34 +23171,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "vinstri beygjur óleyfilegar" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "hægri beygjur óleyfilegar" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "óleyfilegt að halda beint áfrám" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "óleyfilegt að taka U-beygju" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "aðeins_beint_fram" @@ -22638,15 +23207,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "af vegi" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "gegnum hnút eða veg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "að vegi" @@ -22654,5 +23223,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22661,5 +23230,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22667,5 +23236,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22737,24 +23306,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "hjól" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22807,5 +23376,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22814,13 +23383,13 @@ msgstr "fótgangandi" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -22834,10 +23403,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -22845,31 +23414,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -22878,30 +23447,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23112,130 +23681,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23252,98 +23695,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "" @@ -23720,7 +24072,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23784,13 +24136,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23806,5 +24237,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "vegþjónustur" @@ -23818,5 +24249,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23837,5 +24268,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "beygjuhringur" @@ -23850,5 +24281,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23863,5 +24294,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "árbakki" @@ -23875,5 +24306,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "lækur" @@ -23887,5 +24318,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "" @@ -23907,16 +24338,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24013,4 +24432,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24079,13 +24505,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24131,6 +24557,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24147,7 +24573,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24170,10 +24596,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24209,11 +24635,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24254,6 +24681,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24267,5 +24694,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "" @@ -24287,5 +24714,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24299,5 +24726,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24305,4 +24732,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24352,7 +24786,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "skíðalyfta" @@ -24369,5 +24803,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24382,5 +24816,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24395,5 +24829,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24408,5 +24842,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24421,5 +24855,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24434,5 +24868,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24552,11 +24986,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "" @@ -24570,5 +25004,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "bryggja" @@ -24582,5 +25016,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "leiðsla" @@ -24708,12 +25142,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "frístundir" @@ -24727,5 +25178,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "smábátahöfn" @@ -24763,4 +25214,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24779,4 +25246,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24797,8 +25272,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -24900,10 +25377,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25157,5 +25634,5 @@ #. #. -#. +#. #. color health #. @@ -25301,4 +25778,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25318,23 +25803,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25366,6 +25851,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25426,14 +25911,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25780,5 +26265,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25801,5 +26285,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "" @@ -25871,8 +26356,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hótel" @@ -25973,9 +26458,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "ferðamennska" @@ -26063,9 +26548,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "" @@ -26079,5 +26564,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "" @@ -26091,5 +26576,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26111,5 +26596,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "" @@ -26123,5 +26608,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "skógur (ræktaður)" @@ -26135,5 +26620,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26156,5 +26641,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "smásala" @@ -26168,5 +26653,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "iðnaður" @@ -26180,5 +26665,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26192,5 +26677,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26204,5 +26689,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26259,7 +26744,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "" @@ -26273,5 +26758,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "" @@ -26284,5 +26769,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "tindur" @@ -26297,5 +26782,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "jökul" @@ -26309,5 +26794,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "eldfjall" @@ -26362,8 +26847,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26377,5 +26862,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "" @@ -26389,5 +26874,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "" @@ -26401,5 +26886,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26413,5 +26898,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "leðja" @@ -26425,5 +26910,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "strönd" @@ -26501,8 +26986,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "" @@ -26550,7 +27035,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "" @@ -26700,11 +27185,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "" @@ -26752,6 +27237,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "" @@ -27107,4 +27592,283 @@ msgstr "" +#~ msgid "Use an open changeset" +#~ msgstr "Nota opið breytingarsett" + +#~ msgid "Enable proxy server" +#~ msgstr "Nota milliþjón" + +#~ msgid "Anonymous" +#~ msgstr "Nafnlaust" + +#~ msgid "Proxy server host" +#~ msgstr "Nafn milliþjóns" + +#~ msgid "Proxy server port" +#~ msgstr "Port á milliþjóni" + +#~ msgid "Proxy server username" +#~ msgstr "Notandanafn á milliþjóni" + +#~ msgid "Proxy server password" +#~ msgstr "Lykilorð á milliþjóni" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "Tómur bendill, hugsanvega vantar einhver eigindi." + +#~ msgid "Preparing data..." +#~ msgstr "Undirbý gögn..." + +#~ msgid "Preparing..." +#~ msgstr "Undirbý..." + +#~ msgid "Uploading..." +#~ msgstr "Hleð upp gögnum..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Rangt lykilorð eða notandanafn" + +#~ msgid "Enter Password" +#~ msgstr "Sláðu inn lykilorð" + +#~ msgid "Login" +#~ msgstr "Innskrá" + +#~ msgid "Shop" +#~ msgstr "Búð" + +#~ msgid "Unsaved Changes" +#~ msgstr "Óvistaðar breytingar" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM." +#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM." + +#~ msgid "File not found" +#~ msgstr "Skrá fannst ekki" + +#~ msgid "Open in Browser" +#~ msgstr "Opna í vafra" + +#~ msgid "JOSM Online Help" +#~ msgstr "JOSM vefhjálp" + +#~ msgid "Unknown file extension." +#~ msgstr "Óþekkt skráarending" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða " +#~ "reyna síðar." + +#~ msgid "Unknown version" +#~ msgstr "Óþekkt útgáfa" + +#~ msgid "name" +#~ msgstr "nafn" + +#~ msgid "Email" +#~ msgstr "Netfang" + +#~ msgid "Only one node selected" +#~ msgstr "Aðeins einn hnútur valinn" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra." + +#~ msgid "Be sure to include the following information:" +#~ msgstr "Vertu viss um að láta eftirfarandi upplýsingar fylgja:" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Bæta völdum hlutum við venslin" + +#~ msgid "unnamed" +#~ msgstr "ónefnt" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Árekstrar: {0}" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} hlutur hefur árekstra:" +#~ msgstr[1] "{0} hlutir hafa árekstra:" + +#~ msgid "Conflicting relation" +#~ msgstr "Vensl rekast á" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Sameina vegi sem eru stak í mismunandi venslum?" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir " +#~ "það?" + +#~ msgid "Edit Properties" +#~ msgstr "Breyta eigindum" + +#~ msgid "Upload to OSM..." +#~ msgstr "Upphala til OSM..." + +#~ msgid "Please report a ticket at {0}" +#~ msgstr "Vinsamlegast sendu meldinguna á {0}" + +#~ msgid "Include your steps to get to the error (as detailed as possible)!" +#~ msgstr "" +#~ "Sendu með upplýsingar um það hvað þú gerðir sem framkallaði villuna (eins " +#~ "nákvæmt og hægt er)" + +#~ msgid "" +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." +#~ msgstr "" +#~ "Reyndu að uppfæra í nýjustu útgáfuna af JOSM og allar viðbætur áður en þú " +#~ "tilkynnir um villu." + +#~ msgid "sports" +#~ msgstr "íþróttir" + +#~ msgid "Update Data" +#~ msgstr "Uppfæra gögn" + +#~ msgid "Ill-formed node id" +#~ msgstr "Illa-formað kenni á hnút" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt " +#~ "fyrir það?" + +#~ msgid "Sync clock" +#~ msgstr "Samstilla klukkur" + +#~ msgid "Select a bookmark first." +#~ msgstr "Veldu fyrst bókmerki" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Eigindi (tómt gildi eyðir eigindunum)" + +#~ msgid "Remove Selected" +#~ msgstr "Fjarlægja val" + +#~ msgid "Cannot read place search results from server" +#~ msgstr "Get ekki lesið niðurstöðu staðarleitar frá þjóni" + +#~ msgid "zoom" +#~ msgstr "þysja" + +#~ msgid "Revert" +#~ msgstr "Afturkalla" + +#~ msgid "History of Element" +#~ msgstr "Breytingaskrá hluts" + +#~ msgid "Validate" +#~ msgstr "Athuga" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Athuga núverandi val eða öll gögn í laginu." + +#~ msgid "Merging conflicts." +#~ msgstr "Breytingarárekstrar." + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna." + +#~ msgid "Data Layer" +#~ msgstr "Gagnalag" + +#~ msgid "Use preset ''{0}'' of group ''{1}''" +#~ msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“" + +#~ msgid "Use preset ''{0}''" +#~ msgstr "Nota forstillinguna „{0}“" + +#~ msgid "Occupied By" +#~ msgstr "Gengt af" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Sé þessi möguleiki valin mun ferilinn vera sýnilegur öllum á " +#~ "openstreetmap.org" + +#~ msgid "Public" +#~ msgstr "Sýnilegur öllum" + +#~ msgid "Charge" +#~ msgstr "Gjaldtaka" + +#~ msgid "Edit Information Office" +#~ msgstr "Breyti upplýsingamiðstöð" + +#~ msgid "Board Type" +#~ msgstr "Viðfangsefni skiltisins" + +#~ msgid "Map Type" +#~ msgstr "Gerð korts" + +#~ msgid "bicyclemap" +#~ msgstr "hjólakort" + +#~ msgid "citymap" +#~ msgstr "borgarkort" + +#~ msgid "hikingmap" +#~ msgstr "göngukort" + +#~ msgid "map" +#~ msgstr "kort" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Opna myndir með AgPifoJ..." + +#~ msgid "nodes" +#~ msgstr "hnútar" + +#~ msgid "Move Up" +#~ msgstr "Færa upp" + +#~ msgid "Move Down" +#~ msgstr "Færa niður" + +#~ msgid "Members: {0} (linked: {1})" +#~ msgstr "Stök: {0} (tengd: {1})" + +#~ msgid "Please select the row to copy." +#~ msgstr "Veldu hlut til að afrita fyrst." + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst." + +#~ msgid "No data imported." +#~ msgstr "Ekki var náð í nein gögn" + +#~ msgid "Combine Anyway" +#~ msgstr "Sameina þá" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Sameina hnúta sem eru stak í mismunandi venslum?" + #~ msgid "" #~ "Enable to upload all changes in one request, disable to use one request " @@ -27114,241 +27878,4 @@ #~ "ef ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var" -#~ msgid "Sync clock" -#~ msgstr "Samstilla klukkur" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Opna myndir með AgPifoJ..." - -#~ msgid "Unsaved Changes" -#~ msgstr "Óvistaðar breytingar" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM." -#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM." - -#~ msgid "File not found" -#~ msgstr "Skrá fannst ekki" - -#~ msgid "Open in Browser" -#~ msgstr "Opna í vafra" - -#~ msgid "JOSM Online Help" -#~ msgstr "JOSM vefhjálp" - -#~ msgid "Unknown file extension." -#~ msgstr "Óþekkt skráarending" - -#~ msgid "File could not be found." -#~ msgstr "Skrá fannst ekki." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða " -#~ "reyna síðar." - -#~ msgid "Unknown version" -#~ msgstr "Óþekkt útgáfa" - -#~ msgid "name" -#~ msgstr "nafn" - -#~ msgid "Email" -#~ msgstr "Netfang" - -#~ msgid "Only one node selected" -#~ msgstr "Aðeins einn hnútur valinn" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra." - -#~ msgid "Be sure to include the following information:" -#~ msgstr "Vertu viss um að láta eftirfarandi upplýsingar fylgja:" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Bæta völdum hlutum við venslin" - -#~ msgid "unnamed" -#~ msgstr "ónefnt" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Árekstrar: {0}" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} hlutur hefur árekstra:" -#~ msgstr[1] "{0} hlutir hafa árekstra:" - -#~ msgid "Conflicting relation" -#~ msgstr "Vensl rekast á" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Sameina vegi sem eru stak í mismunandi venslum?" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir " -#~ "það?" - -#~ msgid "Edit Properties" -#~ msgstr "Breyta eigindum" - -#~ msgid "Upload to OSM..." -#~ msgstr "Upphala til OSM..." - -#~ msgid "Please report a ticket at {0}" -#~ msgstr "Vinsamlegast sendu meldinguna á {0}" - -#~ msgid "Include your steps to get to the error (as detailed as possible)!" -#~ msgstr "" -#~ "Sendu með upplýsingar um það hvað þú gerðir sem framkallaði villuna (eins " -#~ "nákvæmt og hægt er)" - -#~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before " -#~ "reporting a bug." -#~ msgstr "" -#~ "Reyndu að uppfæra í nýjustu útgáfuna af JOSM og allar viðbætur áður en þú " -#~ "tilkynnir um villu." - -#~ msgid "sports" -#~ msgstr "íþróttir" - -#~ msgid "Update Data" -#~ msgstr "Uppfæra gögn" - -#~ msgid "Ill-formed node id" -#~ msgstr "Illa-formað kenni á hnút" - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "" -#~ "Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt " -#~ "fyrir það?" - -#~ msgid "Select a bookmark first." -#~ msgstr "Veldu fyrst bókmerki" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Eigindi (tómt gildi eyðir eigindunum)" - -#~ msgid "Remove Selected" -#~ msgstr "Fjarlægja val" - -#~ msgid "Cannot read place search results from server" -#~ msgstr "Get ekki lesið niðurstöðu staðarleitar frá þjóni" - -#~ msgid "zoom" -#~ msgstr "þysja" - -#~ msgid "Revert" -#~ msgstr "Afturkalla" - -#~ msgid "History of Element" -#~ msgstr "Breytingaskrá hluts" - -#~ msgid "Validate" -#~ msgstr "Athuga" - -#~ msgid "Validate either current selection or complete dataset." -#~ msgstr "Athuga núverandi val eða öll gögn í laginu." - -#~ msgid "Merging conflicts." -#~ msgstr "Breytingarárekstrar." - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna." - -#~ msgid "Data Layer" -#~ msgstr "Gagnalag" - -#~ msgid "Use preset ''{0}'' of group ''{1}''" -#~ msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“" - -#~ msgid "Use preset ''{0}''" -#~ msgstr "Nota forstillinguna „{0}“" - -#~ msgid "Occupied By" -#~ msgstr "Gengt af" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "" -#~ "Sé þessi möguleiki valin mun ferilinn vera sýnilegur öllum á " -#~ "openstreetmap.org" - -#~ msgid "Public" -#~ msgstr "Sýnilegur öllum" - -#~ msgid "Charge" -#~ msgstr "Gjaldtaka" - -#~ msgid "Edit Information Office" -#~ msgstr "Breyti upplýsingamiðstöð" - -#~ msgid "Board Type" -#~ msgstr "Viðfangsefni skiltisins" - -#~ msgid "Map Type" -#~ msgstr "Gerð korts" - -#~ msgid "bicyclemap" -#~ msgstr "hjólakort" - -#~ msgid "citymap" -#~ msgstr "borgarkort" - -#~ msgid "hikingmap" -#~ msgstr "göngukort" - -#~ msgid "map" -#~ msgstr "kort" - -#~ msgid "nodes" -#~ msgstr "hnútar" - -#~ msgid "Move Up" -#~ msgstr "Færa upp" - -#~ msgid "Move Down" -#~ msgstr "Færa niður" - -#~ msgid "Members: {0} (linked: {1})" -#~ msgstr "Stök: {0} (tengd: {1})" - -#~ msgid "Please select the row to copy." -#~ msgstr "Veldu hlut til að afrita fyrst." - -#~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data " -#~ "layer?" -#~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst." - -#~ msgid "No data imported." -#~ msgstr "Ekki var náð í nein gögn" - -#~ msgid "Combine Anyway" -#~ msgstr "Sameina þá" - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "Sameina hnúta sem eru stak í mismunandi venslum?" - #~ msgid "Use a new changeset and close it" #~ msgstr "Opna nýtt breytingarsett og loka því strax" Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 19198) +++ /applications/editors/josm/i18n/po/it.po (revision 19199) @@ -1,11 +1,12 @@ # Josm italian translation # License: GPL +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-28 21:43+0000\n" -"Last-Translator: David Paleino \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-23 13:20+0000\n" +"Last-Translator: Davide Prade \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,38 +14,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:30+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Creazione dell'interfaccia principale" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Aiuto" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorato un indirizzo URL malformato: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -56,21 +57,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -91,17 +92,8 @@ msgstr "Attenzione" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Impossibile leggere il file ''{0}''.
Errore:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -109,8 +101,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Impossibile leggere il file ''{0}''.
Errore:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -118,10 +119,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -133,9 +134,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -144,6 +146,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -198,8 +200,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -267,5 +269,5 @@ msgstr "Informazioni su JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -277,5 +279,5 @@ "fallirà. L'URL di base delle API è: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -286,5 +288,5 @@ "pagina utente OSM probabilmente fallirà. L'URL di base delle API è: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -296,15 +298,20 @@ "po' di tempo." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Continua" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -313,29 +320,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -352,5 +360,10 @@ msgstr "Annulla" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Fallita l'apertura del browser esterno di aiuto" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Selezionare almeno un nodo, percorso o relazione già caricato." @@ -366,5 +379,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Unisci" @@ -383,15 +396,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Aggiungi nodo..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Aggiungi un nodo inserendo latitudine e longitudine" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -407,22 +420,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Modifica: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Inserire le coordinate per il nuovo nodo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Usa i gradi decimali." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valori negativi denotano l'emisfero Occidentale/Meridionale." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -431,5 +444,5 @@ msgstr "Latitudine" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -438,28 +451,31 @@ msgstr "Longitudine" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +"Per favore inserire un valore di latitudine valido nell'intervallo -90..90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +msgstr "Per favore inserire un valore di latitudine nell'intervallo -90..90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +"Per favore inserire un valore di longitudine valido nell'intervallo -180..180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +msgstr "Per favore inserire un valore di longitudine nell'intervallo -180..180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -471,11 +487,11 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +msgstr "Chiudi la finestra e crea un nuovo nodo" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "Chiudi la finestra, ma non creare un nuovo nodo" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -494,18 +510,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -517,5 +533,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -537,6 +553,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -583,5 +599,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflitto" @@ -618,14 +634,15 @@ msgstr "Nessun conflitto da ingrandire" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Chiudi i gruppi di modifiche aperti" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Chiude i gruppi di modifiche aperti" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -635,21 +652,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "File: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Non ci sono gruppi di modifiche aperti" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Nessun gruppo di modifiche aperto" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Scaricamento dei gruppi di modifiche aperti ..." @@ -736,11 +753,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -820,16 +838,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -865,5 +888,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplica" @@ -893,23 +916,23 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Visualizza a schermo pieno" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Commuta la visualizzazione a schermo pieno" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 msgid "Toggle Fullscreen view" -msgstr "" +msgstr "Commuta la visualizzazione a schermo pieno" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Esporta in GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Esporta i dati in un file GPX." @@ -924,12 +947,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -954,8 +977,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -966,10 +989,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -982,17 +1005,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1031,22 +1054,27 @@ "Visualizza le informazioni dell'oggetto OSM su nodi, percorsi o relazioni." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Unisci aree sovrapposte" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Unisci aree che si sovrappongono l'un l'altra" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Seleziona almeno un percorso chiuso che dovrebbe essere unito." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Attualmente solo due aree possono essere unite." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" non è chiuso e quindi non può essere unito." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1060,14 +1088,10 @@ "Sei veramente sicuro di continuare ?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Si prega di annullare se non si è sicuri" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Seleziona almeno un percorso chiuso che dovrebbe essere unito." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" @@ -1075,25 +1099,25 @@ "modifica." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Nodo aggiunto su tutte le intersezioni" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Elimina i percorsi che non fanno parte di un multi-poligono interno" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Correggi le relazioni" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "L'area auto-sovrapposta è stata unita" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Le aree sovrapposte sono state unite" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1103,33 +1127,33 @@ "favore verifica che non siano stati introdotti errori." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Inserire dei valori per tutti i conflitti." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Risolvi conflitti" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Correggi i conflitti di etichette" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Sono stati rimossi elementi dalle Relazioni" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Unisi Aree: Elimina le way corte" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Strada chiusa (anello)" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Rimuovi i tag dalle way interne" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Funzione di unione delle Aree" @@ -1298,5 +1322,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Impossibile spostare degli oggetti fuori dal mondo." @@ -1376,29 +1400,29 @@ msgstr "Scarica dati" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Disponi ortogonalmente" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" "Sposta i nodi in modo che tutti gli angoli compresi siano di 90 o 270 gradi" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 msgid "Orthogonalize Shape / Undo" msgstr "Ortogonalizza figura / Annulla" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 msgid "Undo orthogonalization for certain nodes" msgstr "Annulla l'ortogonalizzazione per certi nodi" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "Ortogonalizza / Annulla" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1410,9 +1434,9 @@ "ortogonalizzazione figura!" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "Annulla ortogonalizzazione figura" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1424,16 +1448,16 @@ "disattivare questo messaggio.
Continuare?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Disponi ortogonalmente" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Utilizzo" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "Gli elementi selezionati non possono essere ortogonalizzati" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Disponi ortogonalmente" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1506,18 +1530,18 @@ msgstr "Impossibile rinominare il file ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Inverti la direzione dei percorsi" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Inverti la direzione di tutti i percorsi selezionati" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Selezionare almeno un precorso." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Inverti la direzione dei percorsi" @@ -1526,10 +1550,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Salva" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Salva i dati attuali." @@ -1586,10 +1610,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Salva come..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Salva i dati correnti su un nuovo file." @@ -1634,6 +1658,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1667,5 +1690,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1730,5 +1753,5 @@ "seleziona i nodi in mezzo al percorso)." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1739,5 +1762,5 @@ "necessario." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1747,5 +1770,5 @@ "strade
Verificare l'operazione e correggere dove necessario." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1755,5 +1778,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 msgid "Toggle GPX Lines" -msgstr "Visualizza/nascondi le linee GPX" +msgstr "Commuta la visualizzazione delle linee GPX" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 @@ -1764,5 +1787,5 @@ #, java-format msgid "Toggles the global setting ''{0}''." -msgstr "Attiva o disattiva l''impostazione globale ''{0}''." +msgstr "Commuta l''impostazione globale ''{0}''." #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 @@ -1779,34 +1802,34 @@ msgstr "Questo nodo non è attaccato ad altri elementi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Nessuno di questi nodi è attaccato ad altri elementi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Nessun nodo di questo percorso è attaccato ad altri elementi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "La selezione corrente non può essere utilizzata per la separazione." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Selezionare uno di questi:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Un nodo etichettato, oppure" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Un nodo che è usato da più di un percorso, oppure" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1815,5 +1838,5 @@ "oppure" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1822,5 +1845,5 @@ "percorso." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1835,9 +1858,9 @@ "e tutti i nodi saranno selezionati." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Nodo staccato" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1845,5 +1868,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1876,12 +1899,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 msgid "Unselect All (Escape)" -msgstr "Deseleziona tutto (al di fuori)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +msgstr "Deseleziona tutto (Esc)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Aggiorna dati" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "Aggiorna gli oggetti nel livello dei dati attivo dal server." @@ -1889,14 +1912,14 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "Scarica dati" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Non è stato trovato nessun dataset corrente" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" @@ -1904,9 +1927,9 @@ "Nell''insieme di dati corrente non è stato trovato un oggetto con id {0}" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "Aggiorna selezione" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1915,31 +1938,27 @@ "(scarica nuovamente i dati)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Aggiorna la selezione" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "Non ci sono oggetti selezionati da aggiornare." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selezione vuota" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "Aggiorna oggetti" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Carica dati" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" "Carica tutte le modifiche presenti nel livello dei dati attivo sul server OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1950,5 +1969,5 @@ "necessario risolvere prima questi." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1956,161 +1975,7 @@ msgstr "Nessun cambiamento da caricare." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Niente da caricare. Prima è necessario ottenere dei dati." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "Sincronizza solo il nodo {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "Sincronizza solo il percorso {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Sincronizza solo la relazione {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Sincronizza l'intero dataset" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"Caricamento fallito perché il server possiede una " -"versione più recente di uno
dei tuoi nodi, percorsi, o relazioni.
Il " -"conflitto è stato causato da {0} con identificativo " -"{1},
il server possiede la versione {2}, la tua versione è {3}." -"

Cliccare {4} per sincronizzare solamente la " -"primitiva che causa il conflitto.
Cliccare {5} per " -"sincronizzare tutto l''insieme di dati locale con il server.
Cliccare " -"{6} per annullare e continuare ad apportare delle modifiche." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Rilevati conflitti" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Caricamento fallito perché il server possiede una " -"versione più recente di uno
dei tuoi nodi, percorsi, o relazioni." -"

Cliccare {0} per sincronizzare tutto l''insieme di " -"dati locale con il server.
Cliccare {1} per annullare e " -"continuare ad apportare delle modifiche.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"Caricamento fallito a causa dell''utilizzo
del " -"gruppo di modifiche {0} che era già stato chiuso a {1}.
Caricare " -"nuovamente con un gruppo di modifiche nuovo o esistente aperto." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Gruppo di modifiche chiuso" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "Prepara la risoluzione dei conflitti" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "Cliccare per scaricare tutti i percorsi da cui dipende il nodo {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "Cliccare per annullare e per ritornare alla modifica della mappa" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" -"Caricamento fallito perché si è tentato di eliminare " -"il nodo {0} che è ancora utilizzato nel percorso {1}.

Cliccare " -"{2} per scaricare tutti i percorsi da cui dipende il nodo " -"{0}.
JOSM creerà, se necessario, dei conflitti che potranno essere " -"risolti nella relativa finestra." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "Nodo ancora in uso" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" -"Attenzione: la testata dell''errore \"{0}\" non corrisponde ad alcun schema " -"atteso" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Aggiornamento della primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Sto caricando dati per layer \"{0}\"" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Attenzione: l''oggetto ''''{0}'''' risulta già eliminato sul server. Salto " -"questo oggetto e riprovo a caricare." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" -"L''oggetto ''''{0}'''' è già eliminato. Salto l''oggetto durante il " -"caricamento." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "Caricamento di {0} oggetti ..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" -"L''eccezione che è stata generata verrà ignorata perché il caricamento è " -"stato annullato. L''eccezione è: {0}" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2143,8 +2008,9 @@ msgid "Enable/disable rendering the map as wireframe only" msgstr "" +"Abilita/disabilita il disegno della mappa nella sola modalità a fil di ferro" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26 msgid "Toggle Wireframe view" -msgstr "Abilita/disabilita la visualizzazione a fil di ferro" +msgstr "Commuta la visualizzazione a fil di ferro" #. make numpad + behave like + (action is already registred) @@ -2245,9 +2111,9 @@ msgstr "Scarica dati GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Scaricamento dei dati" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2257,5 +2123,5 @@ "Eccezione: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "Non è stato trovato alcun dato in quest'area." @@ -2335,7 +2201,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2353,58 +2219,52 @@ "gli oggetti che si riferiscono a questo." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Disegna" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Disegna i nodi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Modalità: Disegna centro" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "selezionato" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Non si può disegnare un nodo fuori dal mondo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Aggiungi nodo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Aggiungi un nodo al percorso" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Collega un percorso esistente al nodo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Aggiungi un nodo ad un percorso esistente" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Aggiungi un nodo al percorso e connetti" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Crea un nuovo nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Seleziona il nodo sotto il cursore." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2413,14 +2273,14 @@ msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Inizia un nuovo percorso dall'ultimo nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Continua un percorso dall'ultimo nodo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Termina tracciamento." @@ -2442,4 +2302,6 @@ msgid "Move a segment along its normal, then release the mouse button." msgstr "" +"Muovi un segmento lungo la sua perpendicolare, quindi lascia il pulsante del " +"mouse." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2454,4 +2316,6 @@ "its normal." msgstr "" +"Trascina un segmento di percorso per creare un rettangolo. Tieni premuto il " +"tasto Ctrl per muovere un segmento lungo la sua perpendicolare." #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2465,18 +2329,19 @@ "quel punto." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Seleziona" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Seleziona, muovi e ruota gli oggetti." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2485,17 +2350,17 @@ msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Muovi elementi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Muoverli" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Annullare lo spostamento" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2508,9 +2373,9 @@ "Si vuole veramente spostarli?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Sposta sempre e non visualizzare più la finestra di dialogo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -2518,5 +2383,5 @@ "rettangolo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2525,9 +2390,9 @@ "più vicino." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Rilascia il bottone del mouse per interrompere la rotazione." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2540,5 +2405,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zoom" @@ -2563,5 +2428,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Cerca degli oggetti." @@ -2579,5 +2444,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "" +msgstr "Inserire l'espressione di ricerca" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 @@ -2655,7 +2520,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - tutti gli oggetti modificati dall''utente" +msgstr "user:anonymous - tutti gli oggetti modificati da utenti anonimi" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2664,8 +2528,20 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - oggetto con un dato numero di nodi" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" +"tags:... - oggetto con un dato numero di etichette (tags:numero di " +"etichette:min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2675,21 +2551,27 @@ "etichette:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - tutti gli oggetti modificati" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - tutti gli oggetti selezionati" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - tutti gli oggetti incompleti" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - tutti gli oggetti provi di proprietà" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2698,5 +2580,5 @@ "corrispondenti all'espressione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2705,5 +2587,5 @@ "oggetti corrispondenti all'espressione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2711,5 +2593,5 @@ "logico ''or''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2717,11 +2599,11 @@ "contiene :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Utilizzare ( e ) per raggruppare le espressioni" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2729,33 +2611,33 @@ msgstr "Filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Cerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "Invia filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Inizia Ricerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Nessuna corrispondenza trovata per ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nulla è stato rimosso dalla selezione cercando ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" @@ -2763,22 +2645,22 @@ "Nella selezione non è stato trovato alcunché durante la ricerca di ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Trovate {0} corrispondenze" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2792,5 +2674,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2798,10 +2680,10 @@ "etichetta. Esempio di utilizzo: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Errore nella sintassi dello schema: lo schema {0} in {1} non è valido!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2810,26 +2692,29 @@ "relazione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Token inaspettato: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Argomenti mancanti per l'operatore booleano OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Argomento mancante per l'operatore booleano NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Era attesa una parentesi chiusa." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Argomenti mancanti per l'operatore booleano OR." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "Numero errato di parametri per l'operatore tags." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2840,9 +2725,9 @@ "il numero di etichette o un intervallo, per esempio tags:1 oppure tags:2-5" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Numero errato di parametri per operatore sui nodi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2853,7 +2738,12 @@ "richiede un numero o un intervallo di nodi, per esempio nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Valore non corretto per l''operatore id: {0}. E' atteso un numero." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Valore non corretto per l''operatore id: {0}. E' atteso un numero." @@ -2887,45 +2777,35 @@ msgstr "Errore durante la comunicazione con il server" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Il numero di cambiamenti corrente supera il numero massimo consentito, ora " -"sono {0}, il massimo è {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" +"Attenzione: troncamento automatico del valore dell''etichetta ''''{0}'''' " +"sull''oggetto eliminato {1}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" +"Il valore per l''etichetta ''''{0}'''' sull''oggetto {1} supera il limite " +"massimo di lunghezza. Lunghezza permessa {2}. La lunghezza del valore è {3}." + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Violazione della precondizione" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" +"{0} nodi nel percorso {1} superano il massimo consentito. numero di nodi " +"permesso {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Violazione delle capacità delle API" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Attenzione: troncamento automatico del valore del tag {0} sulla primitiva " -"cancellata {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"La lunghezza del valore del tag \"{0}\" sulla primitiva {1} eccede la " -"massima lunghezza ammessa {2}. La lunghezza del valore è {3}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Violazione della precondizione" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"{0} nodi nel percorso {1} superano il massimo consentito. numero di nodi " -"permesso {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -3040,5 +2920,5 @@ msgstr "Imposta {0}={1} per {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -3055,5 +2935,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Doppio conflitto" @@ -3103,4 +2983,6 @@ msgid "At least one object to delete required, got empty collection" msgstr "" +"E' richiesta l'eliminazione di almeno un oggetto, ottenuta una collezione " +"vuota" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 @@ -3159,4 +3041,19 @@ msgstr "Risolvi conflitti nello stato eliminato in {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3271,5 +3168,5 @@ msgstr "Applicare?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3354,17 +3251,17 @@ #, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +msgstr "Era atteso un parametro ''''{0}'''' > 0.0, ottenuto {1}" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "Attenzione: è fallita la persistenza delle preferenze su ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, 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:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3375,5 +3272,5 @@ "delle preferenze ''{0}'' non è in realtà una cartella." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3384,5 +3281,5 @@ "preferenze ''{0}'' non è in realtà una cartella." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3393,5 +3290,5 @@ "possibile creare la cartella delle preferenze mancante: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3402,5 +3299,5 @@ "creare la cartella delle preferenze mancante: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3410,5 +3307,5 @@ "file di preferenze predefinito." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3419,5 +3316,5 @@ "file predefinito." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3428,5 +3325,5 @@ "reimpostare il file delle preferenze con uno predefinito: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3438,5 +3335,5 @@ "predefinito." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3447,5 +3344,5 @@ "possibile reimpostare il file delle preferenze con uno predefinito: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" @@ -3453,5 +3350,5 @@ "Errore: linea ''''{0}'''' non prevista nel file di segnalibro ''''{1}''''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3461,19 +3358,19 @@ "''''{1}'''' nel file di segnalibro ''''{2}''''" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Preferenze salvate in {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Impossibile caricare le preferenze. Motivo: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Impossibile scaricare le preferenze dal server." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" @@ -3482,5 +3379,5 @@ "proveniente dal server" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3491,5 +3388,5 @@ "''''{1}'''' nella lista dei segnalibri proveniente dal server" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3522,5 +3419,5 @@ msgstr "Attenzione: manca il file di revisione ''''/REVISION''''." -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3542,31 +3439,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "O" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Gruppo di modifiche {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3576,5 +3466,5 @@ "incluso" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3589,33 +3479,33 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +msgstr "Manca la destinazione dell''unione per il percorso con id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "Manca la destinazione dell''unione per il nodo con id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "Manca la destinazione dell''unione per l''oggetto con id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "Manca la destinazione dell''unione per la relazione con id {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" +msgstr "Manca la destinazione dell''unione di tipo {0} con id {1}" #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3627,5 +3517,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3633,25 +3523,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "H" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "Testo" #. column header: apply filter for children -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "C" msgstr "C" #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "I" msgstr "I" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "M" @@ -3659,53 +3549,68 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "R" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "A" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "D" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "Era atteso ID >= 0. Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "Una primitiva con ID = 0 non può essere invisibile." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "Era atteso un ID > 0 . Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "attesa versione > 0 . Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Era atteso un parametro ''''{0}'''' > 0, ottenuto {1}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " "other is not" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +"Impossibile unire perché una delle primitive è nuova e le altre invece no" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" "Can''t merge primitives with different ids. This id is {0}, the other is {1}" msgstr "" +"Impossibile unire le primitive con identificativi differenti. Questo id è " +"{0}, l''altro è {1}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37 @@ -3731,10 +3636,6 @@ "ci sono chiavi con valori multipli." -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3742,10 +3643,10 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "" +msgstr "Era atteso un parametro ''''{0}'''' > 0, ottenuto {1}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3759,5 +3660,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3768,4 +3669,6 @@ msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." msgstr "" +"Impossibile confrontare la primitiva con ID ''''{0}'''' alla primitiva con " +"ID ''''{1}''''." #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3775,146 +3678,138 @@ msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Il percorso dello stile dell''area non è chiuso." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "il percorso multi-poligonale ''{0}'' non è chiuso." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Eliminato il membro ''{0}'' nella relazione." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Percorso ''{0}'' con meno di due punti." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "E' stato trovato più di un percorso \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "E' stato trovato più di un percorso \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "E' stata trovata più di una \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Ruolo ''{0}'' sconosciuto." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo di membro sconosciuto per ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Non è stato trovato un percorso \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Non è stato trovato un percorso \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Non è stato trovato alcun nodo o percorso \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Il percorso \"to\" non inizia o finisce su un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Non è stato trovato lo stile per la restrizione {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Il percorso interno ''{0}'' è esterno." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Regola ''{0}'' non utile per il percorso ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-percorso ''{0}'' nel multi-poligono." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Nessun percorso esterno per il multi-poligono ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Lo stile per il percorso esterno ''{0}'' è discordante." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "senza etichetta" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "testo" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "testo dell''area" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Errore: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Attenzione: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "inattivo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "selezionato" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3923,6 +3818,6 @@ msgstr[1] "nodi" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3931,7 +3826,8 @@ msgstr[1] "percorsi" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3940,21 +3836,37 @@ msgstr[1] "relazioni" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "percorso senza etichetta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "percorso incompleto" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "sfondo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "evidenzia" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "senza etichetta" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "testo" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "testo dell''area" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3972,4 +3884,6 @@ "NTF<->RGF93 grid" msgstr "" +"Attenzione: è fallita l''apertura del flusso di entrata per la risorsa ''''/" +"data/{0}''''. Impossibile caricare la griglia NTF<->RGF93" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137 @@ -3991,15 +3905,15 @@ #, java-format msgid "{0} ({1} to {2} degrees)" -msgstr "" +msgstr "{0} ({1} a {2} gradi)" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252 #, java-format msgid "{0} (Corsica)" -msgstr "" +msgstr "{0} (Corsica)" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193 msgid "Lambert CC Zone" -msgstr "" +msgstr "Zona di Lambert CC" #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 @@ -4017,18 +3931,18 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 msgid "PUWG (Poland)" -msgstr "" +msgstr "PUWG (Polonia)" #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:100 msgid "PUWG Zone" -msgstr "" +msgstr "Zona PUWG" #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:160 msgid "PUWG 1992 (Poland)" -msgstr "" +msgstr "PUWG 1992 (Polonia)" #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:213 #, java-format msgid "PUWG 2000 Zone {0} (Poland)" -msgstr "" +msgstr "Zona {0} PUWG 2000 (Polonia)" #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 @@ -4046,21 +3960,21 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 msgid "Guadeloupe Fort-Marigot 1949" -msgstr "" +msgstr "Guadalupa Fort-Marigot 1949" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 msgid "Guadeloupe Ste-Anne 1948" -msgstr "" +msgstr "Guadalupa Ste-Anne 1948" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 msgid "Martinique Fort Desaix 1952" -msgstr "" +msgstr "Martinica Fort Desaix 1952" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:386 msgid "UTM 20N (France)" -msgstr "" +msgstr "UTM 20N (Francia)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:398 msgid "UTM20 North Geodesic system" -msgstr "" +msgstr "Sistema geodetico settentrionale UTM20" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4098,5 +4012,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "ferrovia" @@ -4112,7 +4026,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4128,4 +4042,10 @@ msgstr[1] "{0} membri" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Gruppo di modifiche {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4157,6 +4077,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Conflitto" @@ -4170,7 +4090,7 @@ msgstr "Oggetto eliminato" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4255,75 +4175,75 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nome utente" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Password" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "opzioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Mostra questo aiuto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Scarica la zona delimitata dal riquadro di selezione" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Scarica la zona indicata dall'URL (interpretando lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Apri il file (come gps grezzo se .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "" "Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Seleziona i risultati della ricerca della stringa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Lancia in modalità massimizzata" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Reimposta le preferenze predefinite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Imposta la lingua." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "opzioni fornite come proprietà di sistema Java" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PERCORSO/DELLA/CARTELLA/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "Cambia la cartella per tutte le impostazioni utente" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4336,9 +4256,9 @@ "allocata" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "Esempi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4348,25 +4268,25 @@ "quindi assicurati di caricare dei dati prima di indicare una selezione." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Invece di --download= puoi utilizzare osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Attivazione estensioni aggiornate" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Caricamento vecchie estensioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Impostazioni predefinite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Caricamento estensioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -4375,11 +4295,11 @@ "più usata." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4394,22 +4314,22 @@ msgstr "Modifica" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Visualizza" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Strumenti" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Preimpostati" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4417,5 +4337,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Audio" @@ -4497,13 +4417,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "Utente:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "livello non in lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4537,5 +4458,5 @@ msgstr "Inizializzazione" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4545,6 +4466,6 @@ "relazione." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4555,5 +4476,5 @@ "relazioni." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4564,5 +4485,5 @@ "relazioni." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4571,25 +4492,25 @@ msgstr[1] "Rimozione di {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "Elimina oggetti" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "Da eliminare" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "Dalla relazione" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "Pos." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4597,10 +4518,10 @@ msgstr "Ruolo" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" "Cliccare per chiudere la finestra ed eliminare l'oggetto dalle relazioni" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4633,11 +4554,11 @@ msgstr "il ruolo {0} non partecipa nella comparazione {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Proprietà" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4646,6 +4567,6 @@ msgstr "Etichette" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4653,6 +4574,6 @@ msgstr "Nodi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4660,23 +4581,23 @@ msgstr "Membri" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Non c'è alcun conflitto di etichette in attesa di risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Etichette({0} conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} conflitti di etichette in attesa di risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Nodi(risolti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4685,17 +4606,17 @@ "c'è alcun conflitto in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Nodi(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Conflitti in attesa nella lista di nodi di questo percorso" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Membri(risolti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4705,21 +4626,21 @@ "non c'è alcun conflitto in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Membri(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "Conflitti in attesa nella lista di membri di questa relazione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Non c'è alcun conflitto di proprietà in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Proprietà(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Conflitti di proprietà in attesa di essere risolti" @@ -4751,18 +4672,18 @@ msgstr "elemento {0} non trovato nella lista" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "blocca scorrimento" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Confronta " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Versione personale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" @@ -4770,5 +4691,5 @@ "locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4776,5 +4697,5 @@ msgstr "Versione unita" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4784,10 +4705,10 @@ "appena saranno applicate le decisioni sull'unione." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "La loro versione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" @@ -4795,18 +4716,18 @@ "server" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> inizio" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" "Copia i nodi personali selezionati all'inizio della lista dei nodi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> fine" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" @@ -4814,5 +4735,5 @@ "elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4822,5 +4743,5 @@ "selezionato nella lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4830,5 +4751,5 @@ "nella lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4837,10 +4758,10 @@ "uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" "Copia i loro elementi selezionati alla fine della lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4850,5 +4771,5 @@ "lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4858,23 +4779,23 @@ "lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Su" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Sposta in su gli elementi selezionati di una posizione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Giù" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Sposta in giù le voci selezionate di una posizione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4885,27 +4806,27 @@ msgstr "Elimina" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "Elimina le voci selezionate dalla lista degli elementi uniti" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Blocca" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Blocca" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Blocca la lista attuale degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Sblocca" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Sblocca la lista degli elementi uniti ed inizia l'unione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4916,5 +4837,5 @@ "personali e le loro" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4925,5 +4846,5 @@ "personali e le loro" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4932,5 +4853,5 @@ msgstr[1] "Versione personale ({0} voci)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4939,5 +4860,5 @@ msgstr[1] "Versione unita ({0} voci)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4946,5 +4867,5 @@ msgstr[1] "Loro versione ({0} voci)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4956,5 +4877,5 @@ "partecipazione nella variazione sincronizzata." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5209,10 +5130,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5222,10 +5143,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5314,9 +5235,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Applica" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5324,6 +5245,6 @@ msgstr "nessuno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "tutti" @@ -5419,7 +5340,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5429,6 +5350,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5554,4 +5475,62 @@ msgstr "Visualizza solamente le etichette con conflitti" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Cancella gli oggetti selezionati." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +#, fuzzy +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" +"Seleziona per scaricare i dati in un nuovo livello dei dati." +"
Deselezionare per scaricare nel livello dei dati correntemente attivo." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Insieme di modifiche" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "Carica dal server la lista degli insiemi di modifiche personali aperti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +#, fuzzy +msgid "Select all objects assigned to the currently selected changesets" +msgstr "Chiudi l'insieme di modifiche aperto correntemente selezionato" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Scarica" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Scarica i dati della mappa dal server OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Chiudi i gruppi di modifiche aperti selezionati" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Mostra informazioni" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Apri le relazioni selezionate in un editor" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5566,12 +5545,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5582,5 +5561,5 @@ #, java-format msgid "Toggle: {0}" -msgstr "Abilita/disabilita: {0}" +msgstr "Commuta: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64 @@ -5589,13 +5568,13 @@ msgstr "Pila dei comandi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "Risolvi i conflitti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Risolvi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5603,6 +5582,6 @@ "sopra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5610,25 +5589,25 @@ msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Annulla la risoluzione del conflitto e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Applica i conflitti risolti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Applica risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "Chiudi comunque" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "Continua risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5640,26 +5619,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "Conflitto non risolto completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Risolvi conflitti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Risolvi i conflitti per ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "Filtra oggetti e nascondili/disabilitali." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5670,41 +5649,41 @@ msgstr "Aggiungi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "Aggiungi filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "Modifica filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "Elimina filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "Sposta filtro in alto." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "Sposta filtro in basso." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "Abilita filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "Nascondi elementi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "Applica anche ai figli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "Filtro inverso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "Modalità filtro" @@ -5743,5 +5722,5 @@ msgstr "Visualizza lo storico degli oggetti selezionati." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "Finestra non ancora creata. Invocare prima createInstance()" @@ -5756,34 +5735,34 @@ msgstr "Apre la lista di tutti i livello caricati." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Cancella il livello selezionato." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Mostra/Nascondi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." -msgstr "Inverte la visibilità del livello selezionato." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +msgstr "Commuta la visibilità del livello selezionato." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Attiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Attiva il livello selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Unisci questo livello con un altro livello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Sposta il livello selezionato in su." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Sposta il layer selezionato in giù." @@ -5793,5 +5772,184 @@ msgstr "Informazioni sul livello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relazioni" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Apri tutte le relazioni in una lista" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relazioni: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Apri le relazioni selezionate in un editor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Cancella le relazioni selezionate" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Crea una nuova relazione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" +"Crea una copia di questa relazione e aprila in un'altra finestra dell'editor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "Imposta la selezione corrente con la lista delle relazioni selezionate" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "Seleziona i membri di tutte le relazioni selezionate" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "Seleziona membri" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "Scarica tutti i membri delle relazioni selezionate" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "Scarica membri" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Selezione corrente" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Apri una finestra con la lista delle selezioni." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Fai lo zoom sugli elementi selezionati" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Zoom sulla selezione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Sel.: Rel.:{0}/Percorsi:{1}/Nodi:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Selezione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Selezione: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Stacca il pannello" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Chiudi questo pannello. Lo si può riaprire con i tasti presenti nella barra " +"degli strumenti a sinistra." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Autori" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "" +"Visualizza la lista delle persone che hanno lavorato sugli oggetti " +"selezionati." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} Autore" +msgstr[1] "{0} Autori" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "Seleziona le primitive caricate da questo utente" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "Avvia un browser con le informazioni dell'utente" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" +"Attenzione: avviati i browser delle informazioni per i primi {0} dei {1} " +"utenti selezionati" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" +"Fallita la creazione di un indirizzo URL perché su questo sistema " +"manca la codifica ''''{0}''''." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "Codifica mancante" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Autore" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "N. di oggetti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "incompleto" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "percorso chiuso" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Scaricamento degli insiemi di modifiche ..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5800,22 +5958,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Cambiare i valori?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5824,5 +5982,5 @@ msgstr[1] "Cambia le proprietà di al massimo {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5831,235 +5989,71 @@ msgstr[1] "Questo cambierà {0} oggetti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Seleziona una chiave" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Seleziona un valore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Seleziona gli oggetti di cui vuoi cambiare le proprietà." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Proprietà/Appartenenze" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Proprietà per gli oggetti selezionati." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Membro di" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Aggiungi proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Proprietà: {0} / Appartenenze: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Proprietà / Appartenenze" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Cambia relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Elimina dalla relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Cancella la chiave selezionata in tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Elimina proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relazioni" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Apri tutte le relazioni in una lista" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relazioni: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Apri le relazioni selezionate in un editor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Cancella le relazioni selezionate" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Crea una nuova relazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" -"Crea una copia di questa relazione e aprila in un'altra finestra dell'editor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "Imposta la selezione corrente con la lista delle relazioni selezionate" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "Seleziona i membri di tutte le relazioni selezionate" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "Seleziona membri" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "Scarica tutti i membri delle relazioni selezionate" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "Scarica membri" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Selezione corrente" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Apri una finestra con la lista delle selezioni." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Fai lo zoom sugli elementi selezionati" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Zoom sulla selezione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Sel.: Rel.:{0}/Percorsi:{1}/Nodi:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Selezione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Selezione: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Stacca il pannello" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Chiudi questo pannello. Lo si può riaprire con i tasti presenti nella barra " -"degli strumenti a sinistra." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Autori" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "" -"Visualizza la lista delle persone che hanno lavorato sugli oggetti " -"selezionati." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} Autore" -msgstr[1] "{0} Autori" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "Seleziona le primitive caricate da questo utente" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Mostra informazioni" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "Avvia un browser con le informazioni dell'utente" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" -"Attenzione: avviati i browser delle informazioni per i primi {0} dei {1} " -"utenti selezionati" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" -"Fallita la creazione di un indirizzo URL perché su questo sistema " -"manca la codifica ''''{0}''''." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "Codifica mancante" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Autore" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "N. di oggetti" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -6127,19 +6121,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Scarica tutti i percorsi ed i nodi incompleti di questa relazione" -msgstr[1] "Scarica tutti i percorsi ed i nodi incompleti di questa relazione" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Scarica i membri della relazione" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Scaricamento della relazione {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -6157,14 +6150,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Applica Ruolo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Inserire un ruolo per tutte le appartenenze alla relazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -6177,14 +6168,14 @@ "circolari?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "Rimuovili, ripulisci la relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "Ignorali, mantieni la relazione com'è" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -6197,9 +6188,9 @@ "aggiungere un altro membro alla relazione?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 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:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -6212,5 +6203,5 @@ "''''{0}'''' omessa." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -6219,5 +6210,5 @@ "del primo membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -6226,5 +6217,5 @@ "l'ultimo membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -6234,5 +6225,5 @@ "del primo membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -6242,5 +6233,5 @@ "l'ultimo membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 msgid "Remove all members referring to one of the selected primitives" msgstr "" @@ -6248,10 +6239,10 @@ #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "Editor delle relazioni: Rimuovi selezione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" @@ -6260,5 +6251,5 @@ "selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6269,65 +6260,65 @@ "selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 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:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "Ordina i membri della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" msgstr "Ordina" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "Editor delle relazioni: Ordina" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "Editor delle relazioni: Sposta in alto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "Editor delle relazioni: Sposta in basso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 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:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "Editor delle relazioni: Rimuovi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "Elimina la relazione correntemente modificata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "Si, crea un conflitto e chiudi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 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:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "No, continua la modifica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" @@ -6336,5 +6327,5 @@ "modifica della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6346,9 +6337,9 @@ "desidera creare un conflitto e chiudere l'editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "Conflitto nei dati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6360,49 +6351,47 @@ "riprovare." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "Applica gli aggiornamenti correnti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 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:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 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:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Aggiungi una etichetta vuota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Scarica i membri della relazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Scarica i membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "Editor delle relazioni: Scarica membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "Scarica i membri della relazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 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:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Applica Ruolo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6415,17 +6404,17 @@ "veramente applicare il nuovo ruolo?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "Si, applica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "No, non applicare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "Conferma ruolo vuoto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -6433,19 +6422,19 @@ "correntemente selezionato." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "Zoom a" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" "Ingrandimento disabilitato perché il livello di questa relazione non è attivo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "Ingrandimento disabilitato perché non c'è alcun membro selezionato" @@ -6567,10 +6556,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "Inserire un nome per il segnalibro dell'area di scarico." #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "Nome della posizione" @@ -6580,5 +6569,5 @@ msgstr "Rimuovi i segnalibri correntemente selezionati" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "Rinomina i segnalibri correntemente selezionati" @@ -6671,9 +6660,4 @@ msgid "Download Area" msgstr "Area da scaricare" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Scarica" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6977,6 +6961,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6989,6 +6971,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -7259,4 +7239,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7479,5 +7463,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7520,116 +7504,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Nome" @@ -7653,15 +7637,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Tipo" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "Vicino a" @@ -7858,5 +7842,5 @@ msgstr "Ricarica lo storico dal server" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" @@ -7864,6 +7848,6 @@ "riferimento." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7873,5 +7857,5 @@ "corrisponde allo storico con ID {1}." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7881,5 +7865,5 @@ "è disponibile nello storico." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" @@ -7887,5 +7871,5 @@ "primitiva corrente." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -8002,6 +7986,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "sconosciuto" @@ -8024,14 +8008,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Changeset info" msgstr "Informazioni sul gruppo di modifiche" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Launch browser with information about the changeset" msgstr "" "Lancia il browser con le informazioni relative all''insieme di modifiche" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -8066,4 +8050,140 @@ msgstr "Versione" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Sincronizza solo il nodo {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Sincronizza solo il percorso {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Sincronizza solo la relazione {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Sincronizza l'intero dataset" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Caricamento fallito perché il server possiede una " +"versione più recente di uno
dei tuoi nodi, percorsi, o relazioni.
Il " +"conflitto è stato causato da {0} con identificativo " +"{1},
il server possiede la versione {2}, la tua versione è {3}." +"

Cliccare {4} per sincronizzare solamente la " +"primitiva che causa il conflitto.
Cliccare {5} per " +"sincronizzare tutto l''insieme di dati locale con il server.
Cliccare " +"{6} per annullare e continuare ad apportare delle modifiche." +"
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Rilevati conflitti" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Caricamento fallito perché il server possiede una " +"versione più recente di uno
dei tuoi nodi, percorsi, o relazioni." +"

Cliccare {0} per sincronizzare tutto l''insieme di " +"dati locale con il server.
Cliccare {1} per annullare e " +"continuare ad apportare delle modifiche.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"Caricamento fallito a causa dell''utilizzo
del " +"gruppo di modifiche {0} che era già stato chiuso a {1}.
Caricare " +"nuovamente con un gruppo di modifiche nuovo o esistente aperto." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Gruppo di modifiche chiuso" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "Prepara la risoluzione dei conflitti" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "Cliccare per scaricare tutti i percorsi da cui dipende il nodo {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "Cliccare per annullare e per ritornare alla modifica della mappa" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" +"Caricamento fallito perché si è tentato di eliminare " +"il nodo {0} che è ancora utilizzato nel percorso {1}.

Cliccare " +"{2} per scaricare tutti i percorsi da cui dipende il nodo " +"{0}.
JOSM creerà, se necessario, dei conflitti che potranno essere " +"risolti nella relativa finestra." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "Nodo ancora in uso" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" +"Attenzione: la testata dell''errore \"{0}\" non corrisponde ad alcun schema " +"atteso" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Crea un breve commento ai cambiamenti che sta caricando:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "Inserire un commento al caricamento (min. 3 caratteri)" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -8082,40 +8202,155 @@ msgstr "Nessun changeset aperto" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Apri un nuovo insieme di modifiche" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" +"Apri un nuovo insieme di modifiche ed utilizzalo al prossimo caricamento" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Aggiornamento dell'insieme di modifiche..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Carica i dati su un insieme di modifiche già aperto" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "Chiudi l'insieme di modifiche dopo il caricamento" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" +"Selezionare per chiudere l'insieme di modifiche dopo il prossimo caricamento" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "Carica dal server la lista degli insiemi di modifiche personali aperti" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "Chiudi l'insieme di modifiche aperto correntemente selezionato" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" "Selezionare il gruppo di modifiche che si desidera chiudere" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "Apri gruppi di modifiche" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Chiudi gruppi di modifiche" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "Chiudi i gruppi di modifiche aperti selezionati" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "Annulla la chiusura dei gruppi di modifiche" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Changeset in chiusura" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "Chiusura del gruppo di modifiche {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +#, fuzzy +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" +"Attenzione: non è stato possibile mettere sempre in primo piano la finestra " +"del pannello delle opzioni. L''eccezione è stata: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Salva nome utente e password (non cifrata)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Inserire un nome utente" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Inserire le etichette sul proprio tracciato." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Attenzione: la password è trasferita non cifrata." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Atletica" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "E' stato raggiunto un incrocio" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "Lancia una finestra di selezione file" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "Seleziona il nome del file" @@ -8187,17 +8422,17 @@ msgstr "Salvataggio del livello su ''''{0}'''' ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "Modifiche non salvate - Salvare/caricare prima di uscire?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "Modifiche non salvate - Salvare/caricare prima di eliminare?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "Caricamento e salvataggio dei livelli modificati ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -8214,9 +8449,9 @@ "oppure scartare le modifiche.
Livelli con conflitti:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "Dati non salvati e conflitti" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -8236,9 +8471,9 @@ "modifiche.
Livelli privi di file:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "Dati non salvati e file associato mancante" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -8261,43 +8496,43 @@ "non-scrivibili:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "Dati non salvati con file non-scrivibili" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "Chiudi questa finestra e ritorna alle modifiche in JOSM" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Annulla ed Esci" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "Esci da JOSM senza salvare. Le modifiche non salvate saranno perse." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "Scarta ed elimina" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" "Elimina i livelli senza salvare. Le modifiche non salvate saranno perse." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "Salva/carica ed esci" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" "Esci da JOSM salvando. Le modifiche non salvate saranno caricate e/o salvate." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "Salva/carica ed elimina" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" @@ -8305,10 +8540,10 @@ "saranno perse." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "Preparazione del livello ''{0}'' per il caricamento ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -8318,5 +8553,5 @@ "modifiche
è stata annullata oppure è fallita." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "Caricamento e/o salvataggio incompleto" @@ -8389,40 +8624,399 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Carica" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Aggiorna oggetti" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Impostazioni" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "Decidere come caricare i dati e quale insieme di modifiche utilizzare" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "Etichette del nuovo insieme di modifiche" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "Applica le etichette ai dati dell'insieme di modifiche caricato" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" +"Apri un nuovo insieme di modifiche ed utilizzalo al prossimo caricamento" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "avanzato" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Configura le estensioni disponibili." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Sto caricando dati per layer \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Carica le modifiche" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "Carica le primitive modificate" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" +"Inserire un commento per questo insieme di modifiche (min. 3 caratteri)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "Commento non valido" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "Annulla il caricamento e ritorna alle modifiche" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Etichette dell''insieme di modifiche {0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" +"Attenzione: la primitiva ''{0}'' è già stata eliminata sul server. Ignorare " +"questa primitiva e riprovare a caricare." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "Preparazione delle primitive da caricare ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, fuzzy, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +"Confermare per eliminare {0} oggetti da {1} " +"relazioni." +msgstr[1] "" +"Confermare per eliminare {0} oggetti da {1} " +"relazioni." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Sto caricando dati per layer \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "Continua il caricamento" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +#, fuzzy +msgid "Click to return to the Upload Dialog" +msgstr "Cliccare per chiudere la finestra" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Informazioni su JOSM" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Cliccare per annullare l'unione dei nodi" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Seleziona gli oggetti da caricare" +msgstr[1] "Seleziona gli oggetti da caricare" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Informazioni sul gruppo di modifiche" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Attenzione: l''oggetto ''''{0}'''' risulta già eliminato sul server. Salto " +"questo oggetto e riprovo a caricare." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" +"L''oggetto ''''{0}'''' è già eliminato. Salto l''oggetto durante il " +"caricamento." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "Caricamento di {0} oggetti ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" +"L''eccezione che è stata generata verrà ignorata perché il caricamento è " +"stato annullato. L''eccezione è: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" +"Marca gli oggetti modificati dalla selezione corrente " +"come da caricare sul server." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" +"Marca gli oggetti eliminati localmente come da " +"eliminare sul server." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "Seleziona gli oggetti da caricare" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "Annulla il caricamento" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Scegli la riga da cancellare." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" +"Apri un nuovo insieme di modifiche ed utilizzalo al prossimo caricamento" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Oggetti da aggiungere:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Oggetti da modificare:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Oggetti da eliminare:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8431,5 +9025,5 @@ msgstr[1] "{0} oggetti da aggiungere:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8438,5 +9032,5 @@ msgstr[1] "{0} oggetti da modificare:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8445,220 +9039,37 @@ msgstr[1] "{0} oggetti da eliminare:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Carica le modifiche" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "Carica le primitive modificate" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" -"Inserire un commento per questo insieme di modifiche (min. 3 caratteri)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "Commento non valido" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Per prima cosa inserisci le coordinate della località." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "Annulla il caricamento e ritorna alle modifiche" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Crea un breve commento ai cambiamenti che sta caricando:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "Inserire un commento al caricamento (min. 3 caratteri)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "Apri un nuovo insieme di modifiche" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" -"Apri un nuovo insieme di modifiche ed utilizzalo al prossimo caricamento" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "Utilizza un insieme di modifiche aperto" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Carica i dati su un insieme di modifiche già aperto" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "Chiudi l'insieme di modifiche dopo il caricamento" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" -"Selezionare per chiudere l'insieme di modifiche dopo il prossimo caricamento" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Etichette dell''insieme di modifiche {0}" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "Carica dal server la lista degli insiemi di modifiche personali aperti" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "Chiudi l'insieme di modifiche aperto correntemente selezionato" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "Era atteso un insieme di modifiche con ID > 0. Ottenuto {0}." - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Attenzione: la primitiva ''{0}'' è già stata eliminata sul server. Ignorare " -"questa primitiva e riprovare a caricare." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "Preparazione delle primitive da caricare ..." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" -"Marca gli oggetti modificati dalla selezione corrente " -"come da caricare sul server." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" -"Marca gli oggetti eliminati localmente come da " -"eliminare sul server." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "Seleziona gli oggetti da caricare" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "Annulla il caricamento" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "Continua il caricamento" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "Attenzione: è fallita la persistenza delle preferenze su ''{0}''" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Carica tutte le modifiche in una sola richiesta" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "Richiesta errata" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} metri" -msgstr[1] "{0} metri" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Inserire una stringa di filtro." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, fuzzy, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" -"Il file ''''{0}'''' non è scrivibile. Specificare un altro nome di file." - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "punto GPS" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Personalizza disegno linee" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Usa le impostazioni globali." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Disegna le linee tra i punti di questo livello." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Non disegnare le linee tra i punti di questo livello." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Seleziona le opzioni per il disegno delle linee" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8666,5 +9077,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8673,5 +9084,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8753,5 +9164,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Descrizione" @@ -8783,10 +9194,10 @@ msgstr[1] "{0} punti del percorso" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Converti in livello dati" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8797,12 +9208,12 @@ "tracciati, vedere qui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8811,29 +9222,29 @@ msgstr "Convertito da: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Scarica da OSM lungo questo tracciato" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Scarica tutto entro:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} metri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Area massima per richiesta:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km quadrati" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8844,9 +9255,9 @@ "vuole procedere?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Nessuna traccia GPX da associare con l'audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8857,5 +9268,5 @@ "all'inizio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8865,19 +9276,19 @@ "tracciato per poter essere giustamente calcolati." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Livello dati {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "al di fuori dell'area scaricata" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "versione {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -8885,5 +9296,5 @@ "nella versione 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8892,5 +9303,5 @@ msgstr[1] "Sono stati individuati {0} conflitti." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8910,5 +9321,5 @@ "server." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8925,11 +9336,11 @@ "conflitti e risolverli manualmente." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "Cliccare per chiudere questa finestra e continuare a modificare" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8938,36 +9349,36 @@ msgstr[1] "{0} eliminati" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} è composto da:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "disattiva" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "Versione delle API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Converti in un layer GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8978,5 +9389,5 @@ "vedere qui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8985,5 +9396,5 @@ msgstr[1] "tracciati" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8991,5 +9402,5 @@ msgstr[1] "punti" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8998,5 +9409,5 @@ msgstr[1] "una traccia con {0} punti" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -9005,5 +9416,5 @@ msgstr[1] "{0} è composto da {1} tracce" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -9012,24 +9423,24 @@ msgstr[1] "{0} punti" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "File GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Il file {0} è stato caricato già sotto il nome \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Impossibile interpretare {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Impossibile leggere \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -9040,34 +9451,34 @@ "la foto.
Copia l'ora dalla foto e seleziona la fascia oraria

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Ora di scatto della fotografia (dai dati exif):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Ora GPS (letto dalla fotografia precedente): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [gg/mm/aaaa hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Mi trovo nel fuso orario di: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Nessuna data" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Apri un'altra fotografia" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Sincronizza l'ora da una fotografia del ricevitore GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -9077,155 +9488,117 @@ "Si prega di usare il formato richiesto" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Data non valida" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "Tracciato GPX: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Apri un altro tracciato GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Auto-determina" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Aggiorna la posizione per: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Fuso orario: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Scostamento:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Posso fare una fotografia al mio ricevitore GPS.
Può questo essere " -"di aiuto?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Aggiorna la posizione per: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Tutte le immagini" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Immagini senza posizione exif" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Immagini ancora senza etichetta" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Non è stato selezionato niente!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Correlate {0} su {1} foto al tracciato GPX." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Correla le immagini al tracciato GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Correla" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-determina" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Selezionare un tracciato GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Nessun tracciato GPX selezionato" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Errore nella interpretazione del fuso orario.\n" -"Formato atteso: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 msgid "Invalid timezone" msgstr "Fuso orario non valido" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Errore durante l'analisi dell'offset.\n" -"Formato atteso: {0}." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 msgid "Invalid offset" msgstr "Compensazione non valida" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Trovate {0} corrispondenze {1} nel tracciato GPX {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Tracciato GPS caricato" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Le foto selezionate non contengono informazioni sull'ora." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Le foto non contengono informazioni sull'ora" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"Il tracciato GPX selezionato non contiene le marcature temporali. " -"Selezionarne un altro." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "Il tracciato GPX non contiene alcuna informazione sull'ora" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Tracciato" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 #, java-format msgid "Timezone: {0}" msgstr "Fuso orario: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 #, java-format msgid "Minutes: {0}" msgstr "Minuti: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 #, java-format msgid "Seconds: {0}" msgstr "Secondi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Correlate {0} su {1} foto al tracciato GPX." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" msgstr "(Differenza di orario pari a {0} giorni)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Differenza tra il tracciato e le foto: {0}m {1}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9236,68 +9609,109 @@ "manualmente le foto." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 msgid "Matching photos to track failed" msgstr "E' fallita la correlazione delle foto al tracciato" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 msgid "Adjust timezone and offset" msgstr "Regola fuso orario e differenza" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Valori predefiniti" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "Le foto selezionate non contengono informazioni sull'ora." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Le foto non contengono informazioni sull'ora" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"Il tracciato GPX selezionato non contiene le marcature temporali. " +"Selezionarne un altro." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "Il tracciato GPX non contiene alcuna informazione sull'ora" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 +msgid "You should select a GPX track" +msgstr "Selezionare un tracciato GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 +msgid "No selected GPX track" +msgstr "Nessun tracciato GPX selezionato" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Errore nella interpretazione del fuso orario.\n" +"Formato atteso: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Errore durante l'analisi dell'offset.\n" +"Formato atteso: {0}." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Estrazione delle localizzazioni GPS dagli EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Inizio analisi cartella" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "Uno dei file selezionati era nullo" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Lettura delle foto ..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Lettura di {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Non è possibile ottenere il percorso canonico per la cartella {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Analisi cartella {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Trovato un file nullo nella cartella {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Immagini geoetichettate" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Correlazione ai dati GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -9305,52 +9719,100 @@ msgstr[1] "immagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} sono stati trovati etichettati dal gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Sposta sempre e non visualizzare più la finestra di dialogo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Impossibile trovare il file." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Nessuna immagine" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Caricamento {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Errore nel file {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Visualizza le foto geo-referenziate" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Precedente" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Immagine precedente" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Pagina internet: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Rimuovi la fotografia dal layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Elimina dalla relazione" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Successivo" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Immagine successiva" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Centra la visualizzazione" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Zoom ottimale e 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -9361,5 +9823,5 @@ "Altitudine: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9427,5 +9889,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." -msgstr "Invertire la visualizzazione dei marcatori di testo ed icone" +msgstr "Commuta la visualizzazione dei marcatori di testo ed icone" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171 @@ -9461,4 +9923,12 @@ msgid "Error displaying URL" msgstr "Impossibile visualizzare l'URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9695,7 +10165,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Tutti" @@ -9765,6 +10234,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Bicicletta" @@ -10178,31 +10647,96 @@ "La proiezione {0} non può essere attivata. Si utilizzerà quella di Mercatore" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Abilita il server proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonimo" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Ostello" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Porta:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Password" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Impostazioni Proxy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Host del server proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Porta del server poxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Username del server proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Password del server proxy" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "L'URL di base per il server OSM (API REST)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "Nome di accesso (e-mail) al profilo OSM." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Password per l'account di OSM. Lasciare vuoto per non memorizzare la " +"password." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "URL di base per il server" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "Nome utente OSM (e-mail)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "Password OSM" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"ATTENZIONE: La password viene memorizzata in chiaro nel file di " +"configurazione.
La password è trasmessa in chiaro al server, codificata " +"all'interno dell'indirizzo URL.
Non usare una password importante." #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10516,5 +11050,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10524,13 +11058,13 @@ msgstr[1] "Rimuovi le vecchie chiavi da {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "Aggiungi una nuova etichetta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "Elimina la selezione nella tabella delle etichette" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10538,18 +11072,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Attributi opzionali:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "percorso chiuso" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Tipo sconosciuto: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10560,16 +11094,16 @@ msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Impossibile leggere {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Sono supportati elementi di tipo {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10578,18 +11112,18 @@ msgstr[1] "Modifica {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Non è stato selezionato niente!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Selezione non adatta!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Applica preimpostazione" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Modifica Proprietà" @@ -10618,4 +11152,14 @@ msgstr "Scaricamento dei punti da {0} a {1} in corso..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +#, fuzzy +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" +"Valore non valido per l''attributo ''''{0}'''' sulla etichetta XML " +"''''{1}''''. Ottenuto {2}." + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10631,12 +11175,70 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, è possibile che manchino delle etichette." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Preparazione dei dati in corso..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, fuzzy, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" +"Formato non previsto della nuova versione della primitiva modificata " +"''''{0}''''. Ottenuto ''{1}''." + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +#, fuzzy +msgid "Parsing response from server..." +msgstr "Interrogazione del server dei nomi ..." + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "numero di colonna {0} non atteso" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10740,10 +11342,10 @@ "Errore di scansione: struttura del documento non valida per un documento gpx" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "Modalità {0} sconosciuta." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -10752,6 +11354,6 @@ "dedurre il tipo di primitiva." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10761,20 +11363,20 @@ msgstr "Scaricamento dei dati OSM in corso..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Prelevamento del nodo con {0} da ''''{1}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Prelevamento del percorso con id {0} da ''''{1}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Prelevamento della relazione con id {0} da ''''{1}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -10782,20 +11384,20 @@ "Il server ha risposto con il codice 404 per l''identificativo {0}. Saltato." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Prelevamento di un insieme di nodi da ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Prelevamento di un insieme di percorsi da ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Prelevamento di un insieme di relazioni da ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10805,10 +11407,10 @@ "singola primitiva" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Scaricamento dei punti da {0} a {1} in corso..." -msgstr[1] "Scaricamento dei punti da {0} a {1} in corso..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10845,23 +11447,21 @@ msgstr "Importazione NMEA non riuscita!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, fuzzy, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." msgstr "preferenza ''{0}'' mancante. Impossibile inizializzare OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "Questa versione di JOSM non è compatibile con il configurato." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"Supporta le versioni 0.5 e 0.6 del protocollo, mentre il server dice di " -"supportare le versione da {0} a {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." @@ -10870,11 +11470,11 @@ "protocollo" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10884,63 +11484,74 @@ "''''{0}''''. Ottenuto ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "Creazione dell'insieme di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Insieme di modifiche {0} aperto con successo" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "Era atteso un insieme di modifiche con ID > 0. Ottenuto {0}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Aggiornamento dell'insieme di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "Aggiornamento dell''insieme di modifiche {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Chiusura del gruppo di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" "Non è presente alcun gruppo di modifiche per il caricamento differenziale" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Preparazione in corso..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Invio in corso..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Inizio del caricamento in una richiesta ..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Caricamento di {0} oggetti ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "Attesa di 10 secondi ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Inizio del ripristino {0} di {1} in {2} secondi ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "OK - nuovo tentativo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "Inizio del ripristino {0} di {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" "L'insieme di modifiche corrente è nullo. Non si possono caricare i dati." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." @@ -10949,5 +11560,5 @@ "{0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10976,4 +11587,14 @@ msgid "Invalid bz2 file." msgstr "File bz2 non valido." + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10984,5 +11605,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -11013,5 +11634,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -11019,5 +11640,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -11032,5 +11653,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -11041,63 +11662,6 @@ msgstr "Analisi della lista degli insiemi di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Nome utente o password errati." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Attenzione: la password è trasferita non cifrata." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Salva nome utente e password (non cifrata)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Inserire la password" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Login" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "L'URL di base per il server OSM (API REST)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "Nome di accesso (e-mail) al profilo OSM." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Password per l'account di OSM. Lasciare vuoto per non memorizzare la " -"password." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "URL di base per il server" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "Nome utente OSM (e-mail)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "Password OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"ATTENZIONE: La password viene memorizzata in chiaro nel file di " -"configurazione.
La password è trasmessa in chiaro al server, codificata " -"all'interno dell'indirizzo URL.
Non usare una password importante." - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -11201,5 +11765,12 @@ msgstr "il file \"{0}\" non esiste" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -11210,5 +11781,5 @@ "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" @@ -11216,10 +11787,10 @@ "." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Attributo obbligatorio ''''{0}'''' mancante su del percorso {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." @@ -11228,5 +11799,5 @@ "{0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" @@ -11234,10 +11805,10 @@ "dell'elemento ." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "Attributo ''''ref'''' mancante sul membro nella relazione {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" @@ -11246,10 +11817,10 @@ "{0}. Ottenuto {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Attributo ''''tipo'''' mancante sul membro {0} nella relazione {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -11259,9 +11830,9 @@ "relazione {1}. Ottenuto {2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr " incompleto, specificazione con ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." @@ -11270,10 +11841,10 @@ "ingresso. Omesso." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Oggetto illegale con id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -11285,8 +11856,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -11298,20 +11869,38 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Versione delle API sconosciuta o non supportata. Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "Attributo ''''versione'''' mancante sulla primitiva OSM con ID {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" +"Valore non valido per l''attributo ''''{0}'''' sulla etichetta XML " +"''''{1}''''. Ottenuto {2}." + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "Valore non valido per l''attributo ''''uid''''. Ottenuto ''{0}''." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "Manca l''attributo obbligatorio ''''{0}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." @@ -11319,5 +11908,5 @@ "Valore lungo non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -11327,5 +11916,5 @@ "esterno ''''{1}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -11336,5 +11925,5 @@ "almeno un nodo nei dati caricati." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -11344,5 +11933,5 @@ "esterno ''''{1}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -11353,13 +11942,13 @@ "con ID esterno ''''{1}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Preparazione dati OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "Analisi dei dati OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "Preparazione dell'insieme di dati..." @@ -11382,20 +11971,32 @@ msgstr "Scaricamento delle relazioni collegate ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "Lettura degli insiemi di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "Scaricamento degli insiemi di modifiche ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "Lettura dell''insieme di modifiche {0} ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." +msgstr "Scaricamento dell''insieme di modifiche {0} ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Scaricamento degli insiemi di modifiche ..." +msgstr[1] "Scaricamento degli insiemi di modifiche ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." msgstr "Scaricamento dell''insieme di modifiche {0} ..." @@ -11415,7 +12016,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -11424,11 +12025,5 @@ msgstr "E' fallita l'apertura della connessione alle API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" -"Errore: fallita l'aggiunta delle credenziali di autenticazione alla " -"connessione." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11485,21 +12080,25 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 -#, fuzzy msgid "Starting to upload in chunks..." -msgstr "Inizio del caricamento in una richiesta ..." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format msgid "({0}/{1}) Uploading {2} objects..." -msgstr "Caricamento di {0} oggetti ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Caricamento dati ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Primitive eliminate o spostate" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11541,12 +12140,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Cancella {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Errore nell'eliminazione del file dell'estensione: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11701,9 +12300,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "nessuna descrizione disponibile" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Maggiori dettagli" @@ -11836,4 +12435,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Era atteso un parametro ''''{0}'''' > 0, ottenuto {1}" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -12198,6 +12812,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Carica tracciati" @@ -12284,5 +12898,5 @@ msgstr "Caricamento del tracciato GPX in corso" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Carica i tracciati su openstreetmap.org" @@ -12293,5 +12907,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Interpolazione indirizzo" @@ -12306,11 +12920,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Dispari" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Pari" @@ -12321,24 +12932,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Numero" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "elemento naturale" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "luogo" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Noleggio" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -12356,7 +12963,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "segmento interno" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -12387,5 +12993,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:455 msgid "State:" -msgstr "Stato:" +msgstr "Regione:" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:456 @@ -12425,7 +13031,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 -#, fuzzy msgid "Expected valid number for address increment" -msgstr "Erano attesi numeri dispari per gli indirizzi" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 @@ -12478,5 +13083,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "Seleziona Feuille" @@ -12494,5 +13099,5 @@ #, java-format msgid "Lambert Zone {0} cache file (.{0})" -msgstr "" +msgstr "File di cache della zona di Lambert {0} (.{0})" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 @@ -12507,5 +13112,5 @@ #, java-format msgid "Lambert CC9 Zone {0} cache file (.CC{0})" -msgstr "" +msgstr "File di cache della zona di Lambert CC9 {0} (.CC{0})" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 @@ -12540,21 +13145,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Seleziona il comune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Scegliere da..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Catasto" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Sorgente auto-determinata" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12567,13 +13172,13 @@ "Si desidera ripristinare F11 per l'azione di cattura ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "Ripristino della scorciatoia F11 di cattura" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM si è fermato in attesa che il cambiamento abbia effetto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12600,17 +13205,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "Disabilita il ritaglio dell'immagine durante la georeferenziazione." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Abilita la cache automatica." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Massima dimensione della cache (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12628,9 +13233,9 @@ "caricamento di dati creati da questa estensione." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "WMS francese del catasto" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -12638,10 +13243,10 @@ "automatica" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Sorgente" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12651,5 +13256,5 @@ "preferenze di JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12659,9 +13264,9 @@ "intermedi). Utile per testi su sfondi scuri." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Permette la sovrapposizione di livelli multipli" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -12669,37 +13274,37 @@ "trasparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Traccia un rettangolo attorno i dati scaricati dal server WMS." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "Moltiplicatore di cattura per immagini vettoriali:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Ottieni immagini più piccole (maggiore qualità ma più utilizzo di memoria)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Dimensioni fisse riquadro (predefinito è 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Dimensioni fisse (da 25 a 1000 metri)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "Moltiplicatore di cattura per immagini raster:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "Mostra trasversali:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -12707,9 +13312,6 @@ "dimensione" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Aggiunta l'auto-etichettatura della sorgente:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Aggiungere \"source=...\" agli elementi?" @@ -12926,5 +13528,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Posizione" @@ -13035,6 +13637,6 @@ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -"Zona di Lambert {0} nella cache non compatibile con la zona di Lambert {1} " -"corrente" +"La zona di Lambert {0} nella cache è incompatibile con la corrente zona di " +"Lambert {1}" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424 @@ -13128,5 +13730,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Nessun dato caricato." @@ -13148,9 +13750,9 @@ msgstr "Converti in livello GPX con orario anonimo" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "modifica tracciati gpx" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "ModificaGpx" @@ -13539,7 +14141,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "acqua" @@ -13703,19 +14305,19 @@ msgstr "Impossibile acquisire l'immagine" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Connessione in corso" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Connesso" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Non connesso" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Connessione fallita" @@ -13754,11 +14356,11 @@ msgstr "Livello LiveGPS" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Cattura traccia GPS" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" @@ -13766,22 +14368,22 @@ "LiveGPS." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Centra una volta" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Centra il livello LiveGPS sulla posizione corrente." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Centratura automatica" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Centra continuamente il livello LiveGPS sulla posizione corrente." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13834,9 +14436,9 @@ msgstr "Impossibile disegnare al di fuori del mondo." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "modalità misurazione" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Misure" @@ -13877,5 +14479,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13886,14 +14488,14 @@ msgstr "Crea multi-poligono." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" "Uno dei percorsi selezionati appartiene già ad un altro multi-poligono." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "Il multi-poligono deve consistere solamente in percorsi chiusi." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "Selezionare almeno due percorsi." @@ -14048,5 +14650,5 @@ msgstr "Eseguibile di Firefox" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "PicLayer" @@ -14145,5 +14747,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -14219,41 +14821,41 @@ msgstr "Inserire i valori di peso" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "Ingrandimento automatico" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Carica il tassello" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "Mostra informazioni sul tassello" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Carica tutti i tasselli" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Aumenta l'ingrandimento" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Diminuisci l'ingrandimento" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "Blocca alla dimensione del tassello" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "Svuota la cache dei tasselli" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "immagine " @@ -14428,4 +15030,43 @@ "preimpostazioni delle etichette." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Pari" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Numero più basso" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Numero più alto" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Strade" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Numero più alto" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -14444,43 +15085,21 @@ msgstr "Inverti complesso" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Crea complesso da singolo edificio" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Crea edifici singoli da un edificio lungo" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" "Selezionare un percorso chiuso singolo composto da almeno quattro nodi." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Complesso" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Numero più alto" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Numero più basso" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolazione" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Nome Strada" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Opzionale" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14495,5 +15114,5 @@ msgstr "Nessun errore individuato" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Griglia" @@ -15179,38 +15798,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "building" @@ -15224,5 +15813,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "area" @@ -15349,10 +15938,10 @@ "Impossibile leggere le informazioni dell''id \"{0}\" da walking-papers.org" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Walking Papers: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15411,10 +16000,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:211 msgid "No more connected ways to download." -msgstr "" +msgstr "Non ci sono più percorsi connessi da scaricare." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:220 #, java-format msgid "Node ''{0}'' is a junction with more than 2 connected ways." -msgstr "" +msgstr "Il nodo ''''{0}'''' è un incrocio con più di 2 percorsi connessi." #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 @@ -16097,5 +16686,5 @@ #: build/trans_presets.java:70 build/trans_surveyor.java:72 msgid "Motorway" -msgstr "Motorway" +msgstr "Autostrada/tangenziale" #. item "Highways/Streets/Motorway" @@ -16104,5 +16693,5 @@ #: build/trans_presets.java:73 msgid "Edit Motorway" -msgstr "Modifica Motorway" +msgstr "Modifica autostrada/tangenziale" #. item "Highways/Streets/Motorway" label "Edit Motorway" @@ -16131,6 +16720,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Riferimento" @@ -16418,5 +17007,5 @@ #: build/trans_presets.java:89 msgid "Motorway Link" -msgstr "Motorway Link" +msgstr "Collegamento autostradale" #. item "Highways/Streets/Motorway Link" @@ -16425,5 +17014,5 @@ #: build/trans_presets.java:92 msgid "Edit Motorway Link" -msgstr "Modifica Motorway Link" +msgstr "Modifica collegamento autostradale" #. item "Highways/Streets/Motorway Link" check "Embankment" @@ -16471,5 +17060,5 @@ #: build/trans_presets.java:146 build/trans_surveyor.java:76 msgid "Primary" -msgstr "Primary" +msgstr "Primaria" #. item "Highways/Streets/Primary" @@ -16478,5 +17067,5 @@ #: build/trans_presets.java:149 msgid "Edit Primary Road" -msgstr "Modifica Primary" +msgstr "Modifica strada primaria" #. item "Highways/Streets/Primary" check "Embankment" @@ -16484,10 +17073,10 @@ #: build/trans_presets.java:166 msgid "Primary Link" -msgstr "Primary Link" +msgstr "Svincolo primario" #. item "Highways/Streets/Primary Link" #: build/trans_presets.java:167 msgid "Edit Primary Link" -msgstr "Modifica Primary Link" +msgstr "Modifica svincolo primario" #. item "Highways/Streets/Primary Link" check "Embankment" @@ -16499,5 +17088,5 @@ #: build/trans_presets.java:182 build/trans_surveyor.java:80 msgid "Secondary" -msgstr "Secondary" +msgstr "Secondaria" #. item "Highways/Streets/Secondary" @@ -16507,5 +17096,5 @@ #: build/trans_presets.java:186 msgid "Edit Secondary Road" -msgstr "Modifica una Secondary" +msgstr "Modifica strada secondaria" #. item "Highways/Streets/Secondary" check "Embankment" @@ -16513,5 +17102,5 @@ #: build/trans_presets.java:202 msgid "Tertiary" -msgstr "Tertiary" +msgstr "Terziaria" #. item "Highways/Streets/Tertiary" @@ -16521,5 +17110,5 @@ #: build/trans_presets.java:206 msgid "Edit Tertiary Road" -msgstr "Modifica Tertiary" +msgstr "Modifica strada terziaria" #. item "Highways/Streets/Tertiary" check "Embankment" @@ -16576,5 +17165,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Larghezza (metri)" @@ -16588,5 +17177,5 @@ #: build/trans_presets.java:240 build/trans_surveyor.java:88 msgid "Residential" -msgstr "Residential" +msgstr "Strada residenziale" #. item "Highways/Streets/Residential" @@ -16595,5 +17184,5 @@ #: build/trans_presets.java:243 msgid "Edit Residential Street" -msgstr "Modifica Residential" +msgstr "Modifica strada residenziale" #. item "Highways/Streets/Residential" combo "Layer" @@ -16692,5 +17281,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "metallo" @@ -16702,5 +17291,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "bosco" @@ -16825,5 +17414,5 @@ #: build/trans_presets.java:276 msgid "Service" -msgstr "Service" +msgstr "Strada di servizio" #. item "Highways/Streets/Service" @@ -16832,5 +17421,5 @@ #: build/trans_presets.java:279 msgid "Edit Serviceway" -msgstr "Modifica Serviceway" +msgstr "Modifica strada di servizio" #. item "Highways/Streets/Service" label "Edit Serviceway" @@ -16958,4 +17547,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16987,8 +17579,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "si" @@ -17136,9 +17730,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "no" @@ -17215,5 +17810,5 @@ #: build/trans_presets.java:343 msgid "Public Service Vehicles (psv)" -msgstr "Veicolo di servizio pubblico (psv)" +msgstr "Veicoli di servizio pubblico" #: build/trans_presets.java:344 @@ -17282,9 +17877,9 @@ #: build/trans_style.java:555 msgid "motorway" -msgstr "motorway" +msgstr "autostrada/tangenziale" #: build/trans_presets.java:361 msgid "motorway_link" -msgstr "motorway_link" +msgstr "collegamento autostradale" #. color motorway @@ -17332,9 +17927,9 @@ #: build/trans_style.java:587 msgid "primary" -msgstr "primary" +msgstr "primaria" #: build/trans_presets.java:361 msgid "primary_link" -msgstr "primary_link" +msgstr "svincolo primario" #. color primary @@ -17357,5 +17952,5 @@ #: build/trans_style.java:603 msgid "secondary" -msgstr "secondary" +msgstr "secondaria" #. color secondary @@ -17369,5 +17964,5 @@ #: build/trans_presets.java:361 build/trans_style.java:611 msgid "tertiary" -msgstr "tertiary" +msgstr "terziaria" #: build/trans_presets.java:361 @@ -17383,7 +17978,7 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" -msgstr "residential" +msgstr "residenziale" #: build/trans_presets.java:361 @@ -17416,11 +18011,11 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" -msgstr "service" +msgstr "strada di servizio" #: build/trans_presets.java:361 msgid "bus_guideway" -msgstr "autobus_guidato" +msgstr "autobus guidato" #. color turningcircle @@ -17448,6 +18043,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "construction" @@ -17497,5 +18092,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "rotatoria" @@ -17555,5 +18150,5 @@ #: build/trans_presets.java:488 msgid "Pedestrian" -msgstr "Pedestrian" +msgstr "Area pedonale" #. item "Ways/Pedestrian" @@ -17562,5 +18157,5 @@ #: build/trans_presets.java:491 msgid "Edit Pedestrian Street" -msgstr "Modifica Pedestrian" +msgstr "Modifica area pedonale" #. item "Ways/Pedestrian" text "Width (meters)" @@ -17683,6 +18278,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Percorso escursionistico" @@ -17775,5 +18370,5 @@ #: build/trans_presets.java:762 msgid "Motorway Junction" -msgstr "Motorway Junction" +msgstr "Svincolo autostradale" #. item "Waypoints/Motorway Junction" @@ -17781,5 +18376,5 @@ #: build/trans_presets.java:764 msgid "Edit Motorway Junction" -msgstr "Modifica Motorway Junction" +msgstr "Modifica svincolo autostradale" #. item "Waypoints/Motorway Junction" text "Name" @@ -17791,5 +18386,5 @@ #: build/trans_presets.java:770 msgid "Services" -msgstr "Services" +msgstr "Stazione di servizio" #. item "Waypoints/Services" @@ -17797,5 +18392,5 @@ #: build/trans_presets.java:772 msgid "Edit Service Station" -msgstr "Modifica Service Station" +msgstr "Modifica stazione di servizio" #. item "Waypoints/Services" text "Name" @@ -17803,5 +18398,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17827,4 +18421,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17834,15 +18429,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operatore" @@ -18054,7 +18649,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Elevazione" @@ -18293,5 +18888,5 @@ #: build/trans_presets.java:1024 msgid "Stile" -msgstr "Stile" +msgstr "Scaletta" #. item "Barriers/Stile" @@ -18473,5 +19068,5 @@ msgstr "torbiera" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -18481,5 +19076,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "palude alluvionale" @@ -18824,5 +19419,5 @@ #: build/trans_presets.java:1307 msgid "Bus Guideway" -msgstr "Rotaie del bus" +msgstr "Autobus guidato" #. item "Transport/Railway/Bus Guideway" @@ -18830,5 +19425,5 @@ #: build/trans_presets.java:1309 msgid "Edit Bus Guideway" -msgstr "Modificare le rotaie del bus" +msgstr "Modificare autobus guidato" #. item "Transport/Railway/Bus Guideway" text "Width (meters)" @@ -19005,32 +19600,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Orario di apertura" @@ -19089,91 +19684,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "24/7" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "Lu-Ve 08:30-20:00" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00" @@ -19188,5 +19783,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -19205,7 +19800,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Numero di riferimento" @@ -19221,5 +19816,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "sotterraneo" @@ -19232,6 +19827,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Tariffa" @@ -19270,22 +19865,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Negozio" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Concessionaria" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Autofficina" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Modifica autofficina" @@ -19293,5 +19876,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Noleggio" @@ -19300,10 +19883,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Modifica noleggio automobili" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Condivisione" @@ -19311,5 +19894,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Modifica condivisione automobili" @@ -19317,10 +19900,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Modifica parcheggio per biciclette" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Capacità" @@ -19329,22 +19912,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Modifica noleggio biciclette" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Modifica negozio di biciclette" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Trasporto pubblico" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -19354,5 +19930,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -19360,5 +19936,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "Riferimento UIC" @@ -19366,5 +19942,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Stazione ferroviaria non presidiata" @@ -19372,5 +19948,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Modifica stazione non presidiata" @@ -19378,5 +19954,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Fermata del tram" @@ -19385,5 +19961,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Modifica fermata del tram" @@ -19391,5 +19967,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Piattaforma ferroviaria" @@ -19398,5 +19974,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Modifica una piattaforma ferroviaria" @@ -19408,5 +19984,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Riferimento (numero del tracciato)" @@ -19414,10 +19990,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Area" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Ingresso metropolitana" @@ -19426,10 +20002,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Modifica ingresso metropolitana" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Sedia a rotelle" @@ -19438,5 +20014,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Stazione degli autobus" @@ -19445,5 +20021,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Modifica una stazione degli autobus" @@ -19451,5 +20027,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Fermata dell'autobus" @@ -19459,5 +20035,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Modifica fermata dell'autobus" @@ -19466,17 +20042,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Pensilina/ricovero" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Panchina" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Piattaforma fermata bus" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Modifica una piattaforma degli autobus" @@ -19484,5 +20068,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -19490,5 +20074,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Stazione dei taxi" @@ -19496,5 +20080,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Aeroporto" @@ -19502,15 +20086,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Modifica aeroporto" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -19518,10 +20102,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Viaggio" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Alloggiamento" @@ -19533,5 +20117,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -19540,15 +20124,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Modifica hotel" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Stelle" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motel" @@ -19556,20 +20140,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Modifica Motel" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Guest House" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Modifica Guest House" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Casetta (chalet)" @@ -19577,10 +20161,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Modifica casetta (chalet)" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Ostello" @@ -19588,30 +20172,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Modifica ostello" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Rifugio alpino" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Modifica rifugio alpino" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Area caravan e camper" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Modifica area caravan e camper" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Campeggio" @@ -19619,10 +20203,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Modifica campeggio" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Cibo+bevande" @@ -19633,5 +20217,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Ristorante" @@ -19639,5 +20223,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Modifica ristorante" @@ -19645,5 +20229,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Cucina" @@ -19651,61 +20235,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italiana" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "cinese" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "greca" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "tedesca" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indiana" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" -msgstr "regionale" - -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +msgstr "provinciale" + +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turca" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asiatica" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "tailandese" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "messicana" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "giapponese" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Fast food" @@ -19713,9 +20297,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Modifica fast food" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Caffetteria" @@ -19723,9 +20307,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Caffetteria" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pub" @@ -19733,18 +20317,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Modifica Pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Modifica Biergarten" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Bar" @@ -19752,9 +20336,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Modifica Bar" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Club notturno" @@ -19762,24 +20346,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Modifica club notturno" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turismo" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Attrazione turistica" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Modifica attrazione turistica" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museo" @@ -19787,9 +20371,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Modifica museo" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -19798,9 +20382,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Modifica zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Punto panoramico" @@ -19808,24 +20392,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Modifica punto panoramico" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Torre di avvistamento" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Parco divertimenti" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Modifica parco divertimenti" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Opera d'arte" @@ -19833,5 +20417,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Modifica opera d'arte" @@ -19839,19 +20423,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Ufficio informazioni" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Mappa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "Grado di dettaglio" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "topografico" @@ -19889,5 +20473,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19895,28 +20479,28 @@ msgstr "strada" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "schema" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "Area visualizzata" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "luogo" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "città" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" -msgstr "regione" +msgstr "provincia" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Descrizione più specifica" @@ -19926,5 +20510,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "Percorsi segnalati per:" @@ -19932,6 +20516,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Ciclismo" @@ -19939,5 +20523,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "Mountain bike" @@ -19945,6 +20529,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Sci" @@ -19952,5 +20536,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "Equitazione" @@ -19958,46 +20542,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "... altre modalità di trasporto possibili" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Tabellone informativo" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "Contenuto del cartello" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "avviso" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "storia" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "natura" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "fauna" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "piantine" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "Indicatore stradale" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "Terminale informazioni" @@ -20005,29 +20589,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "Descrizione dettagliata" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1769 msgid "Audioguide" msgstr "Audio-guida" #. -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" msgstr "Audio-guida tramite cellulare?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 +#: build/trans_presets.java:1780 msgid "Phone number" msgstr "Numero di telefono" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Altri punti informativi" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Modifica pensilina/ricovero" @@ -20035,25 +20619,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Caminetto" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Area picnic" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Modifica area picnic" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Luoghi storici" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Castello" @@ -20062,19 +20646,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Modifica castello" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Rovine" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Modifica rovine" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Sito archeologico" @@ -20083,9 +20667,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Modifica sito archeologico" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Campo di battaglia" @@ -20093,10 +20677,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Modifica campo di battaglia" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "Sito paleontologico" @@ -20104,5 +20688,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "Modifica sito paleontologico" @@ -20110,15 +20694,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monumento" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Modifica monumento" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Memoriale" @@ -20126,55 +20710,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Modifica memoriale" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Crocefisso" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Crocefisso" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Edicola votiva" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Modifica edicola votiva" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "Pietra limite" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "Modifica pietra limite" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Svago" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Parco acquatico" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Modifica parco acquatico" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Parco giochi" @@ -20182,35 +20766,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Modifica parco giochi" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Riserva di pesca" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Modifica riserva di pesca" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Articoli sportivi" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Strutture sportive" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadio" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Modifica stadio" @@ -20224,6 +20808,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "seleziona uno sport:" @@ -20615,30 +21199,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "sport" @@ -20648,225 +21232,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "polivalente" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "tiro con l'arco" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "atletica" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "football_australiano" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "pallacanestro" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "boules" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "boccie" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "canoa" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "arrampicata" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "reti_cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "croquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "ciclismo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "cinodromo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "sport_equestri" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "football_americano" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "ginnastica" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hockey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "ippodromo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "autodromo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "racchette" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "poligono_di_tiro" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "pattinaggio" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "comprensorio_sciistico" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "calcio" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "piscina" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "ping_pong" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Centro sportivo" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Modifica centro sportivo" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Campo sportivo" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Modifica campo sportivo" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Circuito (pista)" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Modifica circuito (pista)" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Campo da golf" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Modifica campo da golf" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Modifica minigolf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Struttura polivalente" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Modifica struttura polivalente" @@ -20905,21 +21489,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "tipo" @@ -20958,203 +21542,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "campo_sportivo" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "centro_sportivo" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadio" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "tracciato" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "Bowling" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Modifica bowling" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Atletica" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Modifica atletica" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Tiro con l'arco" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Modifica tiro con l'arco" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Arrampicata" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Modifica arrampicata" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Canoa" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Modifca canoa" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Modifica ciclismo" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Corse dei cani" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Modifica corse dei cani" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Equitazione" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Modificare Equitazione" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Ippodromo" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Modifica ippodromo" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Ginnastica" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Modificare Ginnastica" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Sport motoristici" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Modifica Sport Motoristici" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Pattinaggio" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Modificare Pattinaggio" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Modificare Skateboard" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Piscina" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Modificare Nuoto" @@ -21162,56 +21746,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Modificare Sci" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Tipo di pista" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "Sci alpino" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "Sci nordico" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "snow_park" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Difficoltà" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "principante" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "facile" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "intermedio" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "avanzato" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "esperto" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "freeride" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Poligono di tiro" @@ -21219,182 +21803,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Modifica poligono di tiro" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Sport (Pallone)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Calcio" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Modifica Calcio" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Football" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Modifica football" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Football australiano" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Modifica football australiano" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Modifica Baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Pallacanestro" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Modifica Pallacanestro" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Modifica Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "campo_da_golf" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boule (sport popolare in Francia)" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Modifica boule (sport popolare in Francia)" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Bocce" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Modifica Bocce" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Modifica Cricket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Reti per Cricket" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Modifica Reti per Cricket" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Modifica croquet" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Modifica Hockey" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Modifica Pelota" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Racquet" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Modifica racquet" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Modifica Rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Tennis da tavolo" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Modifica Tenniis da tavolo" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Modifica Tennis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "Artificiale" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Edifici" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Palazzo" @@ -21402,5 +21986,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Edificio pubblico" @@ -21408,10 +21992,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Modifica edificio pubblico" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Municipio" @@ -21419,10 +22003,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Modifica municipio" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Ambasciata" @@ -21430,10 +22014,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Modifica ambasciata" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Tribunale" @@ -21442,10 +22026,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Modifica Palazzio del tribunale" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Prigione" @@ -21454,10 +22038,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Modifica Prigione" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Polizia" @@ -21467,10 +22051,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Modifica Polizia" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Vigili del fuoco" @@ -21479,10 +22063,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Modifica vigili del fuoco" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Ufficio Postale" @@ -21490,5 +22074,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Modifica Ufficio Postale" @@ -21496,15 +22080,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" -msgstr "Asilo" +msgstr "Asilo infantile" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" -msgstr "Modifica Asilo" +msgstr "Modifica asilo infantile" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Scuola" @@ -21512,10 +22096,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" -msgstr "Modifica Scuola" +msgstr "Modifica scuola" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Università" @@ -21523,10 +22107,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Modifica Università" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Scuola superiore" @@ -21534,11 +22118,11 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" -msgstr "Modifica Scuola superiore" +msgstr "Modifica scuola superiore" #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Cinema" @@ -21547,10 +22131,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Modifica Cinema" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Biblioteca" @@ -21559,9 +22143,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Modifica biblioteca" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Centro Artistico" @@ -21569,10 +22153,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Modifica centro d'arte" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Teatro" @@ -21581,10 +22165,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Modifica Teatro" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Luogo di culto" @@ -21594,5 +22178,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Modifica Luogo di culto" @@ -21601,6 +22185,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religione" @@ -21609,66 +22193,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahaismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "Buddista" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "Cristiana" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "induismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "giainismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "Ebraica" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "Mussulmana" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "Spiritualista" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "unitariano" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrismo" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Denominazione" @@ -21677,81 +22261,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "Anglicana" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "Battista" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "Cattolica" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "Evangelica" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "Testimoni di Geova" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "Luterana" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "Metodista" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "Mormone" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "Ortodossa" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "Pentecostale" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "Prebiteriana" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "Protestante" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "Quacchera" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "sciismo" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunnismo" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Indirizzi" @@ -21760,5 +22344,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Modifica dati indirizzo" @@ -21766,5 +22350,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Numero civico" @@ -21772,20 +22356,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Nome Casa" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Nome Strada" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Nome città" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Codice postale" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Codice nazione" @@ -21794,5 +22383,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Modifica interpolazione indirizzo" @@ -21800,61 +22389,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Schema numerazione" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "dispari" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "pari" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "alfabetico" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Artificiale" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Fabbrica" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Modifica fabbrica" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Torre" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Modifica torre" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "Tipo di torre" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "telecomunicazioni" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "osservazione" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "Altezza (metri)" @@ -21862,25 +22451,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Torre idrica" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Modifica torre idrica" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gasometro" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Modifica gasometro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Faro" @@ -21888,10 +22477,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Modifica faro" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Mulino a vento" @@ -21899,10 +22488,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Modifica mulino a vento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Conduttura" @@ -21911,37 +22500,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Modifica conduttura" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "petrolio" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "liquami" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "calore" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "qualunque sostanza" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "subacqueo" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "sopra il suolo" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Depuratore acqua" @@ -21951,10 +22540,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Modifica depuratore acqua" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Gru permanente" @@ -21962,10 +22551,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Modifica gru permanente" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Torre radio" @@ -21973,10 +22562,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Modifica torre radio" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Punto geodetico o altra stazione fissa" @@ -21984,10 +22573,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Modifica punto geodetico o altra stazione fissa" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Telecamera di sorveglianza" @@ -21995,5 +22584,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Modifica telecamera di sorveglianza" @@ -22001,5 +22590,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Centrale elettrica" @@ -22009,35 +22598,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Modifica centrale elettrica" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "eolica" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "idroelettrica" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "a combustibile fossile" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "fissione nucleare" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "carbone" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "fotovoltaico" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Stazione elettrica" @@ -22046,10 +22635,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Modifica stazione elettrica" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Sottostazione elettrica" @@ -22058,5 +22647,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Modifica sottostazione elettrica" @@ -22064,10 +22653,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Riferimento linea" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Pilone (elettricità)" @@ -22078,23 +22667,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Modifica pilone (elettricità)" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "traliccio" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "palo" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "Riferimento torre" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Linea elettrica" @@ -22103,75 +22692,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Modifica linea elettrica" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "Tipo di linea" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "linea" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "linea minore" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Tensione" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "Quantità di cavi" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "Numero di fili (conduttori) per cavo elettrico" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "singola" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "doppia" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "tripla" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "quadrupla" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Servizi" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" -msgstr "Bagni" +msgstr "Bagni pubblici" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Cassetta Postale" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefono" @@ -22180,5 +22769,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Modifica Telefono" @@ -22186,5 +22775,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Monete" @@ -22192,5 +22781,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Note" @@ -22198,5 +22787,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Portafogli elettronici e carte di debito" @@ -22204,5 +22793,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Carte di debito" @@ -22210,15 +22799,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Carte di credito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Carte telefoniche" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Riciclaggio" @@ -22227,5 +22816,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Modifica Stazione di riciclaggio" @@ -22233,68 +22822,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Lattine" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Vestiti" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Vetro" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Carta" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Rottami metallici" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Panchina" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "Schienale" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "Materiale" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "pietra" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "plastica" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "Colore" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "nero" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "marrone" @@ -22365,39 +22949,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "verde" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "rosso" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "blu" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "grigio" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "bianco" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "Quantità di posti" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Postazione di caccia" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Modifica una postazione di caccia" @@ -22406,30 +22990,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Modifica Albero" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "basso" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "mezzo" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "completo" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Nascondi" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Blocco" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fontana" @@ -22438,10 +23022,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Modifica Fontana" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Acqua potabile" @@ -22450,10 +23034,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Modifica acqua potabile" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Culla per la vita" @@ -22461,33 +23045,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Modifica culla per la vita" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Negozi" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Concessionaria" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lago Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Modifica negozio di biciclette" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermercato" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Modifica Supermercato" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "Farmacista" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "Modifica farmacista" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Minimarket" @@ -22495,9 +23103,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Modifica minimarket" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Chiosco" @@ -22505,27 +23113,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Modificia Chiosco" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "Libreria" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "Modifica libreria" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Agenzia di viaggi" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Modifica agenzia di viaggi" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Distributore automatico" @@ -22533,5 +23141,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Modifica Distributore automatico" @@ -22539,88 +23147,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Distributore automatico" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "Biglietti trasporto pubblico" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "Orari trasporto pubblico" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "Biglietti per il parcheggio" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "Alimenti" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "Bevande" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "Dolci" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "Sigarette" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "fotografie" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "Cibo per animali" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "Giornali" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "giocattoli" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "francobolli" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "Schede SIM" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "buoni_telefonici" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "buoni" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "preservativi" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "assorbenti" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "Sacchetto per escrementi" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Conto o carta fedeltà" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Macellaio" @@ -22628,9 +23236,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Modifica Macellaio" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Panificio" @@ -22638,9 +23246,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Modifica Panificio" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Fiorista" @@ -22648,18 +23256,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Modifica Fiorista" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Prodotti biologici" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Modifica negozio di prodotti biologici" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Alcolici (non in Italia)" @@ -22667,54 +23275,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Modifica negozio di alcolici (non in Italia)" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Bevande" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Modifica negozio di bevande" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Modifica negozio di informatica" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Elettronica" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Modifica Negozio di Elettronica" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hi-Fi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Modifica negozio di Hi-Fi" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Mobilia" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Modifica Negozio di Mobilia" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Giardinaggio" @@ -22722,9 +23330,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Modifica giardinaggio" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Ferramenta" @@ -22732,9 +23340,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Modifica Negozio di Ferramenta" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Fai-da-te" @@ -22742,54 +23350,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Modifica negozio Fai-da-te" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Cartoleria" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Modifica cartoleria" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Parrucchiere/barbiere" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Modifica parrucchiere/barbiere" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Calzature" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Modifica Negozio di Scarpe" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Giocattoli" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Modifica Negozio di Giocattoli" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Videoteca" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Modifica videoteca" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Lavanderia a secco" @@ -22797,9 +23405,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Modifica Lavanderia a secco" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Lavanderia" @@ -22807,9 +23415,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Modifica lavanderia" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Sport all'aperto" @@ -22817,28 +23425,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Modifica sport all'aperto" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Modifica articoli sportivi" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Ottico" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Modifica Ottico" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Contanti" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banca" @@ -22846,14 +23454,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Modifica banca" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Bancomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Cambiavalute" @@ -22861,5 +23469,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Modifica cambiavalute" @@ -22867,15 +23475,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Modifica bancomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Salute" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Ambulatorio" @@ -22883,18 +23491,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Modifica ambulatorio" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Dentista" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Modifica dentista" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Farmacia" @@ -22902,5 +23510,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Modifica Farmacia" @@ -22908,9 +23516,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Vendita medicinali con obbligo di prescrizione" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Ospedale" @@ -22918,10 +23526,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Modifica Ospedale" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Colonnina SOS" @@ -22930,5 +23538,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Modifica colonnina SOS" @@ -22937,20 +23545,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Numero del punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Nome del punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Numero di telefono" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Usare prefisso internazionale, es. +12-345-67890)" @@ -22958,5 +23566,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Veterinario" @@ -22965,64 +23573,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Modifica veterinario" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "Geografia" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Luoghi" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Continente" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Modifica continente" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Nazione" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Modifica nazione" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Regione" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Modifica regione" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Provincia" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Modifica provincia" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Contea (in Italia NON usare)" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Modifica contea (in Italia NON usare)" @@ -23030,15 +23638,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Città" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Modifica città" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Paese" @@ -23046,53 +23654,53 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Modifica paese" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" -msgstr "Sobborgo" +msgstr "Quartiere" #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" -msgstr "Modifica Sobborgo" +msgstr "Modifica quartiere" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Frazione" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" -msgstr "Modifica Frazione" +msgstr "Modifica frazione" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Borgo" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" -msgstr "Modifica Borgo" +msgstr "Modifica borgo" #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" -msgstr "Luogo che ha un nome, ma non popolato" +msgstr "Località (luogo con nome, non popolato)" #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" -msgstr "Località" +msgstr "Modifica località (luogo con nome, non popolato)" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Isola" @@ -23100,10 +23708,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Modifica isola" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "Isoletta" @@ -23111,5 +23719,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "Modifica isoletta" @@ -23117,5 +23725,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Entrata di una grotta/caverna" @@ -23123,10 +23731,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Modifica entrata di una grotta/caverna" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Picco montuoso" @@ -23134,10 +23742,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Modifica picco montuoso" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Ghiacciaio" @@ -23145,10 +23753,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Modifica Ghiacciaio" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Vulcano" @@ -23156,70 +23764,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Modifica vulcano" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Confini" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Nazionale" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Modifica confine nazionale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Amministrativo" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Modifica confine amministrativo" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Civile" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Modifica confine civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Politico" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Modifica confine politico" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Parco nazionale" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Modifica Confine Parco Nazionale" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Uso del terreno" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Albero" @@ -23228,15 +23836,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Modifica albero singolo" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Nome Botanico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Bosco" @@ -23245,5 +23853,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Modifica bosco" @@ -23251,17 +23859,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "Conifere" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "deciduo (caducifoglie)" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "Mista" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Foresta" @@ -23270,14 +23878,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Modifica area di foresta" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Riserva naturale" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Modifica riserva naturale" @@ -23285,36 +23893,36 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Ghiaione" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" -msgstr "Modifica Ghiaione" +msgstr "Modifica ghiaione" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Boscaglia" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Modifica boscaglia" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" -msgstr "Fell" +msgstr "Prato alpino" #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" -msgstr "Modifica Fell" +msgstr "Modifica prato alpino" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Brughiera" @@ -23322,5 +23930,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Modifica brughiera" @@ -23328,5 +23936,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Aia" @@ -23335,45 +23943,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Modifica aia" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Area agricola" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Modifica area agricola" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Prato" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Modifica area a prato" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vigna" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Modifica area di vigneto" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "" @@ -23382,25 +23990,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Giardino" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Modifica giardino" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Erba" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Modifica area di prato" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Village Green" @@ -23408,31 +24016,31 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Modifica Village Green" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" -msgstr "Common (UK)" +msgstr "Area comune (UK)" #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" -msgstr "Modifica una Common (UK)" +msgstr "Modifica area comune (UK)" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Parco" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Modifica parco" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Area di svago" @@ -23440,5 +24048,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Modifica area di svago" @@ -23446,15 +24054,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" -msgstr "Residential Landuse" +msgstr "Area residenziale" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" -msgstr "Modifica Residential Landuse" +msgstr "Modifica area residenziale" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Cimitero" @@ -23462,9 +24070,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Modifica Cimitero" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Cimitero" @@ -23472,39 +24080,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Modifica area di cimitero (esteso)" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Commerciale (negozi)" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Modifica area commerciale (negozi)" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Commerciale (uffici)" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Modifica area commerciale (uffici)" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Industriale" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Modifica area industriale" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Deposito materiale ferroviario" @@ -23512,15 +24120,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Modifica deposito materiale ferroviario" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militare" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Modifica area militare" @@ -23528,55 +24136,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Area in costruzione" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Modifica area in costruzione" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Ridestinazione d'uso" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Modifica area di ridestinazione d'uso" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Area agricola destinata alla costruzione" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Modifica area agricola destinata alla costruzione" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Discarica" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Modifica area di discarica" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Cava" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Modifica area di cava/miniera" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multi-poligono" @@ -23586,5 +24194,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Modifica un multi-poligono" @@ -23593,10 +24201,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "segmento esterno" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "segmento interno" @@ -23604,5 +24212,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Divieto di svolta" @@ -23611,5 +24219,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Modifica un divieto di svolta" @@ -23617,34 +24225,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Divieto" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "no svolta a sinistra" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "no svolta a destra" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "non diritto" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "no inversione di marcia" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "solo svolta a destra" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "solo svolta a sinistra" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "solo diritto" @@ -23653,15 +24261,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "dal percorso" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "attraverso il nodo o percorso" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "verso il percorso" @@ -23669,5 +24277,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Percorso" @@ -23676,5 +24284,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Modifica un percorso" @@ -23682,5 +24290,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Tipo di percorso" @@ -23752,24 +24360,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "bicicletta" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "strada" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "traghetto" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "sci" @@ -23822,5 +24430,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23829,13 +24437,13 @@ msgstr "pedone" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "escursionismo" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "deviazione" @@ -23849,10 +24457,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "metropolitana" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Descrizione del simbolo" @@ -23860,31 +24468,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Rete" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "Stato del percorso" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "proposto" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "alternativo" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "temporaneo" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "collegamento" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Colore (esadecimale)" @@ -23893,30 +24501,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "segmento di percorso" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "segmento diretto" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "segmento opposto" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "punto di fermata" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "punto di fermata diretto" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "punto di fermata opposto" @@ -24127,130 +24735,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -24267,98 +24749,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "deprecato" @@ -24735,7 +25126,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "tracciato stradale" @@ -24799,13 +25190,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "ferrovia" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24821,7 +25291,7 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" -msgstr "servizi" +msgstr "stazione di servizio" #. color services @@ -24833,5 +25303,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "guado" @@ -24852,5 +25322,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "slargo per inversione di marcia" @@ -24865,5 +25335,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "punto di accesso di emergenza" @@ -24878,5 +25348,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "sponda" @@ -24890,5 +25360,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "torrente" @@ -24902,5 +25372,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "darsena" @@ -24922,16 +25392,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "acquedotto" - -#. color aqueduct -#. #. 1 #. 50000 @@ -25028,4 +25486,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25094,13 +25559,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "costruzioni umane" @@ -25146,6 +25611,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -25162,7 +25627,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "punto ferroviario" @@ -25185,10 +25650,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "altro_ferrovia" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "ferrovia (sopra)" @@ -25224,11 +25689,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "vecchia_ferrovia" #. color rail +#. #. 1 #. 50000 @@ -25269,6 +25735,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "aeroporto" @@ -25282,5 +25748,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -25302,5 +25768,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "aeroporto (scuro)" @@ -25314,5 +25780,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "aeroporto (chiaro)" @@ -25320,4 +25786,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -25367,7 +25840,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "struttura_di_risalita" @@ -25384,5 +25857,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "pista_facile" @@ -25397,5 +25870,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "pista_intermedia" @@ -25410,5 +25883,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "pista_avanzata" @@ -25423,5 +25896,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "pista esperto" @@ -25436,5 +25909,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "pista libera" @@ -25449,5 +25922,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "pista_principiante" @@ -25567,11 +26040,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "elettricità" @@ -25585,5 +26058,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "pontile" @@ -25597,5 +26070,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "conduttura" @@ -25723,12 +26196,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "struttura per lo svago" @@ -25742,5 +26232,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "porto turistico" @@ -25778,4 +26268,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25794,4 +26300,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25812,8 +26326,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "struttura di servizio" @@ -25915,10 +26431,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "servizio al traffico" @@ -26172,5 +26688,5 @@ #. #. -#. +#. #. color health #. @@ -26316,4 +26832,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -26333,23 +26857,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "struttura di servizio (chiaro)" @@ -26381,6 +26905,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "acqua (chiaro)" @@ -26441,14 +26965,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "salute" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26795,5 +27319,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26816,5 +27339,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "negozio" @@ -26886,8 +27410,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotel" @@ -26988,9 +27512,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turismo" @@ -27078,9 +27602,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "attrazione storica" @@ -27094,5 +27618,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "cava/miniera" @@ -27106,5 +27630,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "discarica" @@ -27126,5 +27650,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "bacino" @@ -27138,5 +27662,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "foresta" @@ -27150,5 +27674,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "aia" @@ -27171,5 +27695,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "area commerciale (negozi)" @@ -27183,5 +27707,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "industriale" @@ -27195,5 +27719,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "ridestinazione d'uso" @@ -27207,5 +27731,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "area agricola destinata alla costruzione" @@ -27219,5 +27743,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "area ferroviaria" @@ -27274,7 +27798,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "militare" @@ -27288,5 +27812,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "cimitero" @@ -27299,5 +27823,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "picco montuoso" @@ -27312,5 +27836,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "ghiacciaio" @@ -27324,5 +27848,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "vulcano" @@ -27377,8 +27901,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "elemento naturale" @@ -27392,5 +27916,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "boscaglia" @@ -27404,5 +27928,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "brughiera" @@ -27416,5 +27940,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "area boschiva non gestita" @@ -27428,5 +27952,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "zona fangosa (sabbie mobili)" @@ -27440,5 +27964,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "spiaggia" @@ -27516,8 +28040,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "percorso" @@ -27565,7 +28089,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "confine" @@ -27715,11 +28239,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "luogo" @@ -27767,6 +28291,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "indirizzo" @@ -28084,5 +28608,5 @@ #: build/trans_wms.java:35 msgid "7th Series (OS7)" -msgstr "" +msgstr "7a Serie (OS7)" #. http://ooc.openstreetmap.org/wms/map.php?source=os7& @@ -28092,20 +28616,20 @@ #: build/trans_wms.java:39 msgid "MLIT Japan (ORTHO)" -msgstr "" +msgstr "MLIT Giappone (ORTHO)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF #: build/trans_wms.java:40 msgid "MLIT Japan (ORTHO01)" -msgstr "" +msgstr "MLIT Giappone (ORTHO01)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF #: build/trans_wms.java:41 msgid "MLIT Japan (ORTHO02)" -msgstr "" +msgstr "MLIT Giappone (ORTHO02)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF #: build/trans_wms.java:42 msgid "MLIT Japan (ORTHO03)" -msgstr "" +msgstr "MLIT Giappone (ORTHO03)" #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF @@ -28115,130 +28639,117 @@ #: build/trans_wms.java:46 msgid "Lodi - Italy" -msgstr "" +msgstr "Lodi - Italia" #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& #: build/trans_wms.java:47 msgid "Sicily - Italy" -msgstr "" +msgstr "Sicilia - Italia" + +#~ msgid "Updating primitive" +#~ msgstr "Aggiornamento della primitiva" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Era attesa una parentesi chiusa." #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " -#~ "disponibile" +#~ "Il numero di cambiamenti corrente supera il numero massimo consentito, " +#~ "ora sono {0}, il massimo è {1}" + +#~ msgid "User with the same uid but different name found" +#~ msgstr "" +#~ "E' stato trovato un utente con lo stesso identificativo ma con nomi " +#~ "differenti" + +#~ msgid "Use an open changeset" +#~ msgstr "Utilizza un insieme di modifiche aperto" #~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Abilitare per caricare tutte le modifiche in una sola richiesta, " -#~ "disabilitare per utilizzare una richiesta per ogni singola primitiva " -#~ "modificata" - -#~ msgid "Images for {0}" -#~ msgstr "Immagini per {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Leggi GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Non è stata trovata nessuna immagine con una data leggibile." - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS inizio: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS fine: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "differenza attuale: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "differenza fuso orario: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} in questa traccia." - -#~ msgid "Sync clock" -#~ msgstr "Sincronizza tempo" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Impossibile leggere la data nel file \"{0}\"." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Orario non presente nei dati EXIF del file \"{0}\"." - -#~ msgid "Image" -#~ msgstr "Immagine" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Fuso orario del GPS (differenza rispetto alle foto)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Sincronizza l'orario con l'unità GPS" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Impossibile decodificare l'orario inserito." - -#~ msgid "" -#~ "WARNING: no API version defined for data to upload. Falling back to " -#~ "version 0.6" +#~ "Posso fare una fotografia al mio ricevitore GPS.
Può questo " +#~ "essere di aiuto?" + +#~ msgid "All images" +#~ msgstr "Tutte le immagini" + +#~ msgid "Images with no exif position" +#~ msgstr "Immagini senza posizione exif" + +#~ msgid "Not yet tagged images" +#~ msgstr "Immagini ancora senza etichetta" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Trovate {0} corrispondenze {1} nel tracciato GPX {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "Tracciato GPS caricato" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Differenza tra il tracciato e le foto: {0}m {1}s" + +#~ msgid "Default Values" +#~ msgstr "Valori predefiniti" + +#~ msgid "Enable proxy server" +#~ msgstr "Abilita il server proxy" + +#~ msgid "Anonymous" +#~ msgstr "Anonimo" + +#~ msgid "Proxy server host" +#~ msgstr "Host del server proxy" + +#~ msgid "Proxy server port" +#~ msgstr "Porta del server poxy" + +#~ msgid "Proxy server username" +#~ msgstr "Username del server proxy" + +#~ msgid "Proxy server password" +#~ msgstr "Password del server proxy" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, è possibile che manchino delle etichette." + +#~ msgid "Preparing data..." +#~ msgstr "Preparazione dei dati in corso..." + +#~ msgid "Preparing..." +#~ msgstr "Preparazione in corso..." + +#~ msgid "Uploading..." +#~ msgstr "Invio in corso..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Nome utente o password errati." + +#~ msgid "Enter Password" +#~ msgstr "Inserire la password" + +#~ msgid "Login" +#~ msgstr "Login" + +#~ msgid "Error: failed to add authentication credentials to the connection." #~ msgstr "" -#~ "ATTENZIONE: non è definita alcuna versione delle API per i dati da " -#~ "caricare. Ritorno alla versione 0.6" - -#~ msgid "" -#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to " -#~ "use diff uploads, but API is not able to handle them. Ignoring diff " -#~ "upload." -#~ msgstr "" -#~ "ATTENZIONE: la preferenza ''''{0}'''' o la versione delle API ''''{1}'''' " -#~ "dell''insieme dei dati richiedono l''utilizzo dei caricamenti " -#~ "differenziali, ma le API non sono in grado di gestirli. Ignorato il " -#~ "caricamento differenziale." - -#~ msgid "" -#~ "Loading of {0} plugin was requested. This plugin is no longer required." -#~ msgstr "" -#~ "E'' stato richiesto il caricamento dell''estensione {0}. Questa " -#~ "estensione non è più necessaria." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - fotografie con geotag" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Apri immagini con AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "Opzioni osmarender" - -#~ msgid "Group common Address Interpolation inputs in a single dialog," -#~ msgstr "" -#~ "Raggruppa gli inserimenti delle interpolazioni degli indirizzi in una " -#~ "finestra unica," - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "Un'altra estensione JOSM per la geo-etichettatura. Correla le immagini " -#~ "con i tracciati GPS oppure importa le immagini geo-etichettate mediante " -#~ "EXIF." - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Alcune utilità per rendere la propria vita più facile: ad esempio la " -#~ "semplificazione dei percorsi, l'unione di aree, il salto alla posizione." +#~ "Errore: fallita l'aggiunta delle credenziali di autenticazione alla " +#~ "connessione." + +#~ msgid "Auto-tag source added:" +#~ msgstr "Aggiunta l'auto-etichettatura della sorgente:" + +#~ msgid "Interpolation" +#~ msgstr "Interpolazione" + +#~ msgid "Optional" +#~ msgstr "Opzionale" + +#~ msgid "Shop" +#~ msgstr "Negozio" + +#~ msgid "aqueduct" +#~ msgstr "acquedotto" #~ msgid "No data imported." @@ -28247,7 +28758,4 @@ #~ msgid "Refresh the selection list." #~ msgstr "Ricarica la lista di selezione" - -#~ msgid "File could not be found." -#~ msgstr "Impossibile trovare il file." #~ msgid "Please select at least one task to download" @@ -28356,4 +28864,52 @@ #~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)." +#~ msgid "Images for {0}" +#~ msgstr "Immagini per {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Leggi GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Non è stata trovata nessuna immagine con una data leggibile." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS inizio: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS fine: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "differenza attuale: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "differenza fuso orario: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} in questa traccia." + +#~ msgid "Sync clock" +#~ msgstr "Sincronizza tempo" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Impossibile leggere la data nel file \"{0}\"." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Orario non presente nei dati EXIF del file \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Immagine" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Impossibile decodificare l'orario inserito." + #~ msgid "name" #~ msgstr "nome" @@ -28399,4 +28955,7 @@ #~ msgid "Navigation" #~ msgstr "Navigazione" + +#~ msgid "osmarender options" +#~ msgstr "Opzioni osmarender" #~ msgid "Merge nodes with different memberships?" @@ -28440,4 +28999,7 @@ #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - fotografie con geotag" #~ msgid "Adjust the position of the WMS layer" @@ -28600,4 +29162,7 @@ #~ msgstr "Il server non supporta i changeset (API < 0.6)" +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Fuso orario del GPS (differenza rispetto alle foto)" + #~ msgid "Please report a ticket at {0}" #~ msgstr "Si prega di segnalare il problema a {0}" @@ -28622,4 +29187,7 @@ #~ msgid "Import TCX File..." #~ msgstr "Importa file TCX..." + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Apri immagini con AgPifoJ..." #~ msgid "" @@ -28811,4 +29379,7 @@ #~ "e crea un nuovo layer sulla nuova zona." +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Sincronizza l'orario con l'unità GPS" + #~ msgid "Selected makes your trace public in openstreetmap.org" #~ msgstr "" @@ -28945,4 +29516,12 @@ #~ msgid "sports" #~ msgstr "Articoli sportivi" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Un'altra estensione JOSM per la geo-etichettatura. Correla le immagini " +#~ "con i tracciati GPS oppure importa le immagini geo-etichettate mediante " +#~ "EXIF." #~ msgid "Directly load TCX files from JOSM." @@ -28956,4 +29535,11 @@ #~ "che appartengono ad un utente selezionato, apre il browser per la " #~ "visualizzazione della pagina del profilo dell'autore." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Alcune utilità per rendere la propria vita più facile: ad esempio la " +#~ "semplificazione dei percorsi, l'unione di aree, il salto alla posizione." #~ msgid "" @@ -29042,7 +29628,4 @@ #~ msgid "Select a starting node on the end of a way" #~ msgstr "Selezionare un nodo iniziale alla fine di un percorso" - -#~ msgid "Reached a junction" -#~ msgstr "E' stato raggiunto un incrocio" #~ msgid "" @@ -29230,4 +29813,10 @@ #~ "E'' stato generato un errore durante il salvataggio. L''errore è: {0}" +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "E'' stato richiesto il caricamento dell''estensione {0}. Questa " +#~ "estensione non è più necessaria." + #~ msgid "Delete all" #~ msgstr "Elimina tutto" @@ -29235,4 +29824,12 @@ #~ msgid "Linked" #~ msgstr "Collegato" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Abilitare per caricare tutte le modifiche in una sola richiesta, " +#~ "disabilitare per utilizzare una richiesta per ogni singola primitiva " +#~ "modificata" #~ msgid "" @@ -29270,4 +29867,10 @@ #~ "nella propria lingua." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " +#~ "disponibile" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "Pagina di aiuto mancante. Crearla in italiano." @@ -29355,4 +29958,9 @@ #~ msgstr "" #~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0}" + +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "" +#~ "Raggruppa gli inserimenti delle interpolazioni degli indirizzi in una " +#~ "finestra unica," #~ msgid "Relation: from {0} to {1} via {2}" @@ -29389,4 +29997,21 @@ #~ "server OSM ''''{1}''''.
L''insieme di modifiche sarà automaticamente " #~ "chiuso dal server dopo un intervallo massimo di attesa." + +#~ msgid "" +#~ "WARNING: no API version defined for data to upload. Falling back to " +#~ "version 0.6" +#~ msgstr "" +#~ "ATTENZIONE: non è definita alcuna versione delle API per i dati da " +#~ "caricare. Ritorno alla versione 0.6" + +#~ msgid "" +#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to " +#~ "use diff uploads, but API is not able to handle them. Ignoring diff " +#~ "upload." +#~ msgstr "" +#~ "ATTENZIONE: la preferenza ''''{0}'''' o la versione delle API ''''{1}'''' " +#~ "dell''insieme dei dati richiedono l''utilizzo dei caricamenti " +#~ "differenziali, ma le API non sono in grado di gestirli. Ignorato il " +#~ "caricamento differenziale." #~ msgid "Preset group ''{0}'' of group ''{1}''" Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 19198) +++ /applications/editors/josm/i18n/po/ja.po (revision 19199) @@ -4,10 +4,11 @@ # FIRST AUTHOR , 2008. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-29 14:47+0000\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-17 05:41+0000\n" "Last-Translator: higa4 \n" "Language-Team: Japanese \n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:16+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:29+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "メインGUIを作成します。" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "ヘルプ" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "不正な形式のURLの\"{0}\"を無視します。" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,18 +95,8 @@ msgstr "警告" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "不正な形式のファイルURL\"{0}\"を無視します。" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"ファイル ''{0}'' が読み込めません。
エラー内容:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -113,8 +104,18 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"ファイル ''{0}'' が読み込めません。
エラー内容:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -122,10 +123,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -137,9 +138,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -148,6 +150,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -202,8 +204,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -271,5 +273,5 @@ msgstr "JOSMについて" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -280,5 +282,5 @@ "ジにリダイレクトすると、おそらく失敗します。API ベース URL は \"{0}\" です。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -289,5 +291,5 @@ "すると、おそらく失敗します。API ベース URL は \"{0}\" です。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -298,15 +300,20 @@ "で散らかり
終わらせるのに少し時間が掛かります。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "続ける" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -315,29 +322,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -354,5 +362,10 @@ msgstr "キャンセル" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "外部ヘルプブラウザの起動に失敗" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -370,5 +383,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "マージ" @@ -388,15 +401,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "ノードを追加..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "緯度経度を指定して、ノードを追加" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -412,22 +425,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "編集: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "新しいノードの座標を入力してください" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "十進経緯度を使う。" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "負の値は、西半球（西経）または南半球（南緯）を意味します。" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -436,5 +449,5 @@ msgstr "緯度" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -443,28 +456,29 @@ msgstr "経度" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +msgstr "-90から90の範囲で正しい緯度を入力してください" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +msgstr "-90から90の範囲で緯度を入力してください" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +msgstr "-180から180の範囲で正しい経度を入力してください" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +msgstr "-180から180の範囲で経度を入力してください" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -476,11 +490,11 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +msgstr "ダイアログを閉じて新しいノードを作成" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "ダイアログを閉じて、新しいノードを作成しない" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -499,18 +513,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -522,5 +536,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -542,6 +556,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -588,5 +602,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "競合" @@ -623,14 +637,15 @@ msgstr "ズームの対象になる競合はありません" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "開かれた変更セットを閉じます" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "開かれた変更セットを閉じます" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -640,21 +655,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "ファイル: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "開かれた変更セットはありません" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "開かれた変更セットはありません" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "開かれた変更セットをダウンロード中 ..." @@ -738,11 +753,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -821,16 +837,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -866,5 +887,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "複製" @@ -907,10 +928,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "GPXにエクスポート..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "データをGPXファイルにエクスポートします。" @@ -925,12 +946,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -955,8 +976,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -967,10 +988,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -983,17 +1004,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1032,22 +1053,27 @@ msgstr "OSM ノード、ウェイまたはリレーションについてのオブジェクト情報を表示" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "オーバーラップ領域を接続する。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "お互いのオーバラップ範囲を接続する。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "結合させるクローズドノードを最低ひとつ選んでください。" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "現在最大2つまでのエリアのみ結合できます。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" は閉じられていないので連結できません。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1060,38 +1086,34 @@ "本当に続けますか？" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "確信していないならば、中止して下さい。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "結合させるクローズドノードを最低ひとつ選んでください。" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "交差点がみつかりません。何も変更されませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "すべての交差点にノードを追加" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "内側のマルチポリゴンの一部ではないウェイを削除" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "リレーションの修正" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "結合された自己重複エリア" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "結合されたオーバーラップエリア" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1101,33 +1123,33 @@ "ことを確認してください。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "すべての競合に値を入力してください。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "競合を解決する" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "タグ競合を修正" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "リレーションから要素を削除" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "エリアの結合：　短いウェイの削除" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "閉じたウェイ" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "内部のウェイからタグを削除" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "エリア結合機能" @@ -1293,5 +1315,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "オブジェクトを世界の外に移動できません。" @@ -1371,28 +1393,28 @@ msgstr "データをダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "直交した形状" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 msgid "Orthogonalize Shape / Undo" msgstr "輪郭をオルソ化 / 無効化" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 msgid "Undo orthogonalization for certain nodes" msgstr "いくつかのノードのオルソ化を無効化" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "オルソ化 / 無効化" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1401,9 +1423,9 @@ msgstr "輪郭をオルソ化 / 無効化" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "オルソ化された輪郭を無効化" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1415,16 +1437,16 @@ "て見てください。
続けますか?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "垂直化" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "使用法" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "選択された要素はオルソ化できません" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "垂直化" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1496,18 +1518,18 @@ msgstr "ファイル ''{0}'' をリネームできません" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "ウェイ方向反転" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "選択したウェイ全ての方向を反転します。" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "少なくとも１つのウェイを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "ウェイ方向反転" @@ -1516,10 +1538,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "保存" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "最新データを保存します。" @@ -1576,10 +1598,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "名前をつけて保存..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "現在のデータを新規ファイルに保存" @@ -1622,6 +1644,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1652,5 +1673,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1710,5 +1731,5 @@ "する）" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1718,5 +1739,5 @@ "した。
これらを確認して必要なら訂正してください。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1726,5 +1747,5 @@ "らを確認して必要なら訂正してください。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1758,45 +1779,45 @@ msgstr "このノードは、他のどれとも接着していません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "どのノードも接着していません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "どのウェイも接着していません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "現在の選択は引き離せません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "ほかを選択：" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* 1つのタグのついたノード、または" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* 1つ以上のウェイに使われている1つのノード, または" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" "* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1811,9 +1832,9 @@ "コピーが作られ、全てのノードが選択状態になります。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "ノードを引き離す" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1821,5 +1842,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1854,10 +1875,10 @@ msgstr "全てを選択解除（Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "データを更新" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "サーバから有効なデータレイヤーのオブジェクトを更新します。" @@ -1865,23 +1886,23 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "データのダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "現在のデータセットが見つかりません" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "現在のデータセットには ID {0} のオブジェクトがありません" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "選択を更新" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1889,30 +1910,26 @@ "サーバから（再ダウンロードデータ）現在選択されたオブジェクトを更新します" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "選択を更新" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "更新するオブジェクトが選択されていません" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "選択は空です" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "オブジェクトを更新" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "データをアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "OSMサーバへの有効なデータレイヤーの全ての変更をアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1923,5 +1940,5 @@ "さい。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1929,155 +1946,7 @@ msgstr "アップロードする変更はありません。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "アップロードするものがありません。最初にデータを取得してください。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "ノード {0} だけを同期" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "ウェイ {0} だけを同期" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "リレーション {0} だけを同期" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "データセット全体を同期" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"アップロード失敗: サーバーはあなたのノード・ウェイ・リ" -"レーションのどれかに、
もっと新しいバージョンのものを持っているようです。" -"
この競合は、id {1} の {0} でおきまし" -"た。
サーバーにあるバージョンは {2} で、あなたのは {3} です。

競合" -"したプリミティブのみを同期させるには、{4}をクリックしてくだ" -"さい。
全ローカルセットを同期させるには、{5} をクリック" -"してください。
中止して編集を継続するには、{6} をクリック" -"してください。
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "競合が検出されました" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"アップロード失敗: サーバーはあなたのノード・ウェイ・リ" -"レーションのどれかに、
もっと新しいバージョンのものを持っているようです。" -"
全ローカルセットを同期させるには、{0} をクリックしてくだ" -"さい。
中止して編集を継続するには、{1} をクリックしてくだ" -"さい。
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"アップロード 失敗: あなたが
チェンジセット {0} を使" -"用しています。それはすでに {1} に閉じられましたので、
もう一度新規または既" -"に開いている変更セットをアップロードしてください。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "変更セットは閉じられました" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "競合解決の準備" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "クリックしてノード {0}用の全ての親ウェイをダウンロード" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "クリックしてキャンセル後に地図編集を再開" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" -"アップロード 失敗 ウェイ {1} が使用中のノード {0} を削" -"除しようとしました。

{2} をクリックしてノード {0} の" -"全ての親ウェイをダウンロードしてください。
必要ならJOSM は競合解決ダイアロ" -"グで解決できる競合として作成します。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "ノードはまだ使用中です" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "警告: エラーヘッダ \"{0}\" は想定されたパターンに一致しません" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "プリミティブ更新中" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "レイヤー ''{0}'' へデータをアップロード中" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェク" -"トをスキップしてもう一度アップロードします。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" -"オブジェクト ''{0}'' は既に削除されています。アップロード中のオブジェクトをス" -"キップします。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "{0} オブジェクトをアップロード中 ..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "アップロードがキャンセルされたため捕捉した例外を無視します。例外: {0}" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2212,9 +2081,9 @@ msgstr "ダウンロードされたGPXデータ" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "データをダウンロード中" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2222,5 +2091,5 @@ msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "この範囲ではデータは見つかりません" @@ -2298,7 +2167,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2315,58 +2184,52 @@ "ノードは消さない。 Ctrl: 参照するオブジェクトを消す。" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "描画" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "ノードを描画" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "モード: フォーカスを描画" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "選択済の" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "世界の外にノードを追加できません。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "ノードを追加" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "ノードでウェイに追加" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "既存のウェイをノードとつなぎます。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "既存のウェイに新しいノードを追加" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "ウェイのノードを追加して接続" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "新規ノードの作成" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "カーソルの下のノードを選択" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2374,14 +2237,14 @@ msgstr[0] "新規ノードを {0}このウェイに追加します。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "新規ウェイを最後に操作したノードから開始" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "最後に操作したノードからウェイを継続" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "描画の完了" @@ -2422,18 +2285,19 @@ "を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "選択" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "オブジェクトの選択、移動および回転" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2441,17 +2305,17 @@ msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "要素を移動" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "これらを移動する。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "移動を取り消す" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2464,13 +2328,13 @@ "本当に移動しますか？" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "常に移動し、ダイアログ表示は不要" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2479,9 +2343,9 @@ "マージします。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "回転を止めるには、マウスボタンを放します。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2493,5 +2357,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "ズーム" @@ -2515,5 +2379,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "オブジェクトを検索する。" @@ -2531,5 +2395,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "" +msgstr "検索表現を入力" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 @@ -2606,7 +2470,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - 該当ユーザに変更された全オブジェクト" +msgstr "ユーザ:匿名 - 匿名ユーザによって変更された全てのオブジェクト" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2615,54 +2478,74 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - 指定されたノード番号のオブジェクト" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" +"タグ:... - 与えられた数値のタグのオブジェクト (タグ:count または タグ:" +"min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" "max)" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +"タグ:... - 与えられた数値のタグのオブジェクト (タグ:count または タグ:" +"min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "変更済み - 変更されたオブジェクトすべて" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "選択- 選択されたオブジェクトすべて" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "不完全 - すべての不完全なオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "タグなし - すべてのタグなしオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "child 式 - 式にマッチしたオブジェクトの全ての子" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent 式 - 式にマッチしたオブジェクトの全ての親" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "| や ORを、論理和をとるために使う" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "\" を演算子をくくるために使ってください。（例：キーが：を含む)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "グループの分類のために ( と ) を使用する。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2670,55 +2553,55 @@ msgstr "フィルター" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "検索" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "フィルターを登録" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "検索開始" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "\"{0}\"にマッチするものが見つからない" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "''{0}'' を探しましたがセレクションの中には見つかりませんでした" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "{0} の一致が見つかりました" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2732,5 +2615,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2738,10 +2621,10 @@ "ださい: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2750,26 +2633,29 @@ "\"relation\"です。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "予想外のトークン: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "orに引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "not に引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "閉じ括弧があるはずです。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "orに引数がありません。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +msgstr "タグオペレータ用のパラメータ数値誤り。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2778,9 +2664,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "間違った数のパラメータが、ノード演算子に渡されました。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2791,7 +2677,12 @@ "い、例えば ノード: 10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "不正なid演算子の値: {0}。数字を入力してください。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "不正なid演算子の値: {0}。数字を入力してください。" @@ -2825,43 +2716,30 @@ msgstr "サーバとの通信中にエラー。" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "前提条件違反" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" +"ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "API機能違反" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"警告：削除されたプリミティブ {1} のタグ\"{0}\"の値が、自動的に切り詰められま" -"す。" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"プリミティブ{1}のタグ\"{0}\"の値の長さが最大値を超えています。有効な長さは{2}" -"です。値の長さは{3}です。" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "前提条件違反" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2975,5 +2853,5 @@ msgstr "Set {0}={1} for {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2990,5 +2868,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "二重の競合" @@ -3093,4 +2971,19 @@ msgstr "{0} 内の削除済み状態の競合を解決" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3202,5 +3095,5 @@ msgstr "適用しますか?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3266,5 +3159,5 @@ #, java-format msgid "Expected array of length 4, got {0}" -msgstr "" +msgstr "長さ4の配列が期待されています、入力値{0}" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:62 @@ -3282,17 +3175,17 @@ #, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +msgstr "パラメータ ''{0}'' > 0.0 が期待されています。入力値 {1}" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "警告: プレセットの設定を ''{0}''とするのに失敗しました。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "不正な設定がファイルの{0}行目にあります。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3303,5 +3196,5 @@ "ありません。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3312,5 +3205,5 @@ "ではありません。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3320,5 +3213,5 @@ "警告: 設定を初期化するのに失敗しました。作成に失敗した設定ディレクトリ: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3329,5 +3222,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3337,5 +3230,5 @@ "す。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3345,5 +3238,5 @@ "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3354,5 +3247,5 @@ "トできません" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3363,5 +3256,5 @@ "
に取って、新しい初期設定ファイルを作ります。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3372,35 +3265,36 @@ "に失敗" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +msgstr "エラー: ブックマークファイル''{1}'' に予期せぬ行 ''{0}''" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +"エラー: ブックマークファイル ''{2}'' 内の行 ''{1}'' に不正なダブル値 ''{0}''" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "設定は{0}に保存" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "設定をアップロードできませんでした。理由: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "サーバから設定をロードできませんでした。" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +msgstr "エラー: サーバからのブックマークリストに予期せぬ行 ''{0}''" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3408,6 +3302,7 @@ "server" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +"エラー: サーバからのブックマークリストの行 ''{1}'' に不正なダブル値 ''{0}''" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3421,5 +3316,5 @@ #, java-format msgid "Failed to load load resource ''{0}''. Error is {1}" -msgstr "" +msgstr "リソース ''{0}''のロードに失敗しました。エラー内容 {1}" #: ../core/src/org/openstreetmap/josm/data/Version.java:93 @@ -3438,5 +3333,5 @@ msgstr "警告: リビジョンファイル ''/REVISION'' がありません。" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3458,31 +3353,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "南" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "北" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "西" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "東" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "変更セット {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3490,5 +3378,5 @@ msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3499,33 +3387,33 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +msgstr "ID {0} のウェイの結合ターゲットが見つかりません" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "ID {0} のノードの結合ターゲットが見つかりません" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "ID {0} のオブジェクトの結合ターゲットが見つかりません" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "ID {0} のリレーションの結合ターゲットが見つかりません" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" +msgstr "ID {1} のタイプ {0} の結合ターゲットが見つかりません" #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3537,5 +3425,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3543,25 +3431,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "H" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "テキスト" #. column header: apply filter for children -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "C" msgstr "C" #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "I" msgstr "I" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "M" @@ -3569,43 +3457,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "R" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "A" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "D" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "ID >= 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "id=0 のプリミティブは非表示にできません" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "ID > 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "バージョン > 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3613,5 +3513,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3644,10 +3544,6 @@ "す。" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "同じuidで異なる名前のユーザが見つかりました" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3655,7 +3551,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3671,5 +3567,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3687,146 +3583,138 @@ msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "領域を指定するウェイが閉じていません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "メンバー \"{0}\"を関連から削除" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "ウェイ\"{0}\"は二つ未満のポイントです。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "二つ以上の\"from\"ウェイがあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "二つ以上の\"to\"ウェイがあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "経由地が複数有ります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "不明なロール\"{0}\"です。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "{0}のメンバーのタイプが不明" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "\"from\"ウェイが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "\"to\"ウェイが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "経由地かウェイが見つかりません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "制約条件{0}のスタイルがありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "ウェイ \"{0}\"と\"{1}\"の交差する点" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "内部のウェイ ''{0}''が外側にあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "マルチポリゴンにウェイではない\"{0}\"があります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "外側のウェイ ''{0}''のスタイルが合いません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "タグ付いていない" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "テキスト" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "エリアテキスト" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Warning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "停止中" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "選択済の" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3834,6 +3722,6 @@ msgstr[0] "ノード" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3841,7 +3729,8 @@ msgstr[0] "ウェイ" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3849,21 +3738,37 @@ msgstr[0] "関連" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "タグ付いていないウェイ" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "不完全なウェイ" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "背景" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "ハイライト" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "タグ付いていない" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "テキスト" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "エリアテキスト" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3884,5 +3789,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137 msgid "Lambert 4 Zones (France)" -msgstr "" +msgstr "ランベルト 4 ゾーン（フランス）" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:249 @@ -3900,19 +3805,19 @@ #, java-format msgid "{0} ({1} to {2} degrees)" -msgstr "" +msgstr "{0} ({1} から {2} 度)" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252 #, java-format msgid "{0} (Corsica)" -msgstr "" +msgstr "{0} (コルシカ)" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193 msgid "Lambert CC Zone" -msgstr "" +msgstr "ランベルトCCゾーン" #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" -msgstr "" +msgstr "ランベルトCC9ゾーン（フランス）" #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96 @@ -3926,5 +3831,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 msgid "PUWG (Poland)" -msgstr "" +msgstr "PUWG（ポーランド）" #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:100 @@ -4006,5 +3911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "鉄道" @@ -4020,7 +3925,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4034,4 +3939,10 @@ msgstr[0] "{0} メンバー" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "変更セット {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4063,6 +3974,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "競合" @@ -4076,7 +3987,7 @@ msgstr "オブジェクトは削除されました" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4161,74 +4072,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "ユーザ名" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "パスワード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "使用法" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "オプション" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "このヘルプの表示" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "標準のunix配置引数" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "bounding boxをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "ファイルを開く（.gpxの場合生のGPSとして)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "bounding boxを生GPSとしてダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "検索から選択" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "最大モードで起動" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "設定を既定に戻します。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "言語の変更" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "Javaシステムのプロパティとして提供されるオプション" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "全てのユーザ設定用フォルダを変更" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4240,9 +4151,9 @@ " Javaの使用メモリ最大サイズを増やすオプション" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "例" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4252,36 +4163,36 @@ "読み込まれることにご注意ください。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "--download=のかわりに osm://を指定できます。\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "アップデートしたプラグインの活性化" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "早期読み込みプラグインのロード中" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "デフォルト設定" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "プラグインのロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "設定 {0} はもう使われていないので、除かれました。" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "ファイル" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4296,22 +4207,22 @@ msgstr "編集" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "ツール" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "プリセット" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4319,5 +4230,5 @@ msgstr "メニュー: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "音声" @@ -4398,13 +4309,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "ユーザ:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "レイヤーがリストにありません。" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4437,5 +4349,5 @@ msgstr "初期化" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4445,6 +4357,6 @@ "削除して良いか確認してください。" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4455,5 +4367,5 @@ "ら削除して良いか確認してください。" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4464,5 +4376,5 @@ "から削除して良いか確認してください。" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4470,25 +4382,25 @@ msgstr[0] "{0} オブジェクトを削除中" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "オブジェクトを削除" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "リレーションから" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "位置" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4496,9 +4408,9 @@ msgstr "役割" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "クリックしてダイアログを閉じ、オブジェクトをリレーションから削除" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "クリックしてダイアログを閉じ、オブジェクト削除を中断" @@ -4530,11 +4442,11 @@ msgstr "ロール {0} は比較ペア {1} に参加していません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "プロパティ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4543,6 +4455,6 @@ msgstr "タグ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4550,6 +4462,6 @@ msgstr "ノード" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4557,23 +4469,23 @@ msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "解決が必要な保留中のタグ競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "タグ({0} 競合)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "解決待ちの保留中タグ競合 {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "ノード(解決済み)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4582,17 +4494,17 @@ "合はありません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "ノード(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "このウェイのノードリスト内の保留中競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "メンバー(解決済み)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4602,21 +4514,21 @@ "保留中の競合はありません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "メンバー(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "このリレーションのメンバーリスト内の保留中競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "保留中のプロパティ競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "プロパティ(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "解決が必要な保留中競合プロパティ" @@ -4648,22 +4560,22 @@ msgstr "アイテム {0} はリストに見つかりません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "スクロールをロック" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "比較 " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "自分のバージョン" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "自分のデータセットの要素リスト、例：ローカルデータセット" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4671,5 +4583,5 @@ msgstr "結合したバージョン" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4679,30 +4591,30 @@ "るでしょう。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "相手のバージョン" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "相手のデータセットの要素リスト、例：サーバデータセット" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> 先頭" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "選択したノードを結合されたノードリストの先頭にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> 最後" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "選択した要素を結合された要素リストの最後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4711,5 +4623,5 @@ "選択した要素を、結合された要素リストから選択している最初の要素の前にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4718,14 +4630,14 @@ "選択した要素を、結合された要素リストから選択している最初の要素の後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "相手の選択した要素を、結合された要素リストの先頭にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "相手の選択した要素を、結合された要素リストの最後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4734,5 +4646,5 @@ "相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4741,23 +4653,23 @@ "相手の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "上" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "同じ位置で選択した要素を上に移動" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "下" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "同じ位置で選択したエントリを下に移動" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4768,27 +4680,27 @@ msgstr "削除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "結合された要素のリストから選択したエントリを削除" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "固定" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "固定" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "結合された要素の現在のリストを固定" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "固定解除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "結合された要素のリスト固定を解除して結合をはじめる" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4799,5 +4711,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4808,5 +4720,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4814,5 +4726,5 @@ msgstr[0] "自分のバージョン ({0} エントリ)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4820,5 +4732,5 @@ msgstr[0] "結合したバージョン ({0} エントリ)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4826,5 +4738,5 @@ msgstr[0] "相手のバージョン ({0} エントリ)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4835,5 +4747,5 @@ "調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5079,10 +4991,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5092,10 +5004,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5181,9 +5093,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "適用" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5191,6 +5103,6 @@ msgstr "なし" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "全て" @@ -5280,7 +5192,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5289,6 +5201,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5400,4 +5312,58 @@ msgstr "競合のあるタグだけを表示" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "選択したオブジェクトを削除します" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "変更セット" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "現在のデータレイヤー内のこのノードにズーム" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +#, fuzzy +msgid "Select all objects assigned to the currently selected changesets" +msgstr "現在選択済みの開かれた変更セットを閉じる" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "ダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "地図データをOSMサーバからダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "選択済みの開かれた変更セットを閉じる" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "情報を表示" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "選択したリレーションの編集画面を開く" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5411,12 +5377,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5434,18 +5400,18 @@ msgstr "指示の集積: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "競合を解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "上記リストの全てのアイテムを結合するダイアログを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5453,25 +5419,25 @@ msgstr "マップ上の選択した要素を、上記リストの選択したアイテムに設定します。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "競合の解決をキャンセルしてダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "解決済みの競合を適用してダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "解決を適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "強制的に閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "解決を続ける" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5483,26 +5449,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "競合は完全には解決されていません" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "競合を解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "''{0}'' の競合を解決する" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "オブジェクトにフィルターをかけ、非表示/無効にします。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5513,41 +5479,41 @@ msgstr "追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "フィルターを追加。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "フィルターを編集。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "フィルターを削除。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "フィルターを上に移動。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "フィルターを下に移動。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "フィルターを有効化" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "要素を非表示にする" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "子へも適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "反転フィルター" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "フィルターモード" @@ -5586,5 +5552,5 @@ msgstr "選択したオブジェクトの履歴を表示。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5601,34 +5567,34 @@ msgstr "全ての読み込んだレイヤーのリストを開きます" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "選択したレイヤーの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "表示/非表示" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "選択したレイヤーの表示状態を切り替え" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "有効化" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "選択されたレイヤーを有効化" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "このレイヤーを他のレイヤーに結合" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "選択したレイヤーを一つ上に上げます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "選択したレイヤーを一つ下に移動します。" @@ -5638,29 +5604,202 @@ msgstr "レイヤーについての情報" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "リレーション" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "全てのリレーションのリストを開く" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "リレーション: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "選択したリレーションの編集画面を開く" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "選択したリレーションを削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "新規リレーション作成" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "現在の選択を選択したリレーションのリストへセットする" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "全ての選択済リレーションのメンバーを選択" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "メンバーを選択" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "選択済リレーションの全メンバーをダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "メンバーをダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "現在の選択範囲" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "セレクションリスト　ウインドウを開きます。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "選択した要素にズーム" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "セレクションへズーム" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "選択" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "選択: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "パネルの取り外し" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"このパネルを閉じます。左側のツールバーのボタンを使うことで再度開くことができ" +"ます。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "クリックすることでパネルの内容を最小化/最大化" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "作者" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "選択したオブジェクトで作業した人たちのリストを開く" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} 作者" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "このユーザが登録したプリミティブを選択" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "ユーザについての情報付きでブラウザを起動" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" +"警告: 選択されたユーザ {1} のうち、最初の {0} だけに情報ブラウザを起動します" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" +"URL の作成に失敗しました。エンコーディング ''{0}''は
このシステムに" +"はありません。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "エンコーディングがありません" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "作者" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# オブジェクト" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "不完全" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "閉じたウェイ" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "変更セットをダウンロード中 ..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +msgstr[0] "これにより {0} オブジェクトが変更されます" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "空の値でタグを削除します。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "<差異あり>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "値を変更しますか?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5668,5 +5807,5 @@ msgstr[0] "{0}このオブジェクトのプロパティーの変更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5674,230 +5813,71 @@ msgstr[0] "これは、最大{0}このオブジェクトが変更されます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "キーを選択してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "値を選択してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "プロパティを変えたいオブジェクトを選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "プロパティ/メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "選択されたオブジェクトのプロパティ" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "プロパティの追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "プロパティ: {0} / メンバー: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "プロパティ/メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "関連の変更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "関連から削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "本当に関連{0}から選択分を削除しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "すべてのオブジェクトの選択したキーの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "プロパティの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "すべてのオブジェクトに新しいキー/値をペアで追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "すべてのオブジェクトの選択したキーの値の編集" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "リレーション" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "全てのリレーションのリストを開く" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "リレーション: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "選択したリレーションの編集画面を開く" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "選択したリレーションを削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "新規リレーション作成" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "現在の選択を選択したリレーションのリストへセットする" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "全ての選択済リレーションのメンバーを選択" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "メンバーを選択" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "選択済リレーションの全メンバーをダウンロード" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "メンバーをダウンロード" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "現在の選択範囲" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "セレクションリスト　ウインドウを開きます。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "選択した要素にズーム" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "セレクションへズーム" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "選択" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "選択: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "パネルの取り外し" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"このパネルを閉じます。左側のツールバーのボタンを使うことで再度開くことができ" -"ます。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "クリックすることでパネルの内容を最小化/最大化" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "作者" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "選択したオブジェクトで作業した人たちのリストを開く" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} 作者" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "このユーザが登録したプリミティブを選択" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "情報を表示" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "ユーザについての情報付きでブラウザを起動" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" -"警告: 選択されたユーザ {1} のうち、最初の {0} だけに情報ブラウザを起動します" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" -"URL の作成に失敗しました。エンコーディング ''{0}''は
このシステムに" -"はありません。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "エンコーディングがありません" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "作者" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# オブジェクト" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5960,18 +5940,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "リレーション''{0}'' をダウンロード中" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "リレーションメンバーをダウンロード" +msgstr "リレーションをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "リレーション''{0}'' をダウンロード中" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -5989,14 +5969,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" msgstr "ロールを適用" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "全てのリレーションメンバーシップ用のロールを入力" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "ロールを入力して選択されたリレーションメンバーに適用" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -6008,14 +5986,14 @@ "参照をどうしますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "削除し、リレーションをクリーンナップ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "無視し、リレーションはそのまま" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -6028,9 +6006,9 @@ "か？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "複数のメンバーが同じプリミティブを参照しています" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -6042,5 +6020,5 @@ "起こすので薦められません。
リレーション ''{0}'' をスキップします。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -6048,5 +6026,5 @@ "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -6054,5 +6032,5 @@ "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -6062,5 +6040,5 @@ "に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -6070,20 +6048,20 @@ "に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "リレーション編集画面: 削除が選択されました" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6093,70 +6071,69 @@ "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "選択されたリレーションメンバーのプリミティブを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "リレーションメンバーをソート" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "スポーツ" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "並べ替え" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "リレーション編集画面: ソート" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "現在選択したメンバーを一つ上に移動します" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "リレーション編集画面: 上へ移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "選択したメンバーを一つ下に移動します" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "リレーション編集画面: 下へ移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "このリレーションから現在選択されたメンバーを削除" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "リレーション編集画面: 削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "現在編集されたリレーションを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "はい、競合を作成して閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "クリックして競合を作成し、このリレーションエディタを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "いいえ、編集を続ける" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6167,9 +6144,9 @@ "集を続けることはできません

競合を作成してエディタを閉じますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "データ中に競合" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6180,49 +6157,47 @@ "最初にこの競合を解決してからやり直してください。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "現在の更新を適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "更新を適用してダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "更新をキャンセルしてダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "空のタグを追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "リレーションメンバーをダウンロード" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "全ての不完全なメンバーをダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "メンバーのダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "リレーション編集画面: メンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "リレーションメンバーをダウンロード" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "選択された不完全なメンバーをダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "選択されたメンバーにロールをセット" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "ロールを適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6234,34 +6209,34 @@ "ルを削除することになります。
新しいロールを本当に適用しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "はい、適用します" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "いいえ、適用しません" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "空のロールを確認" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "現在選択中のリレーションメンバーが参照しているリレーションを編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "ズームする:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "最初に選択されたメンバーが参照しているオブジェクトにズーム" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "このリレーションのレイヤーは有効でないのでズームは無効化されました" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "選択されたメンバーが無いのでズームは無効化されました" @@ -6375,10 +6350,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "ブックマークされたエリアの名前を入力してください。" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "ロケーション名" @@ -6388,5 +6363,5 @@ msgstr "現在選択中のブックマークを削除" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "現在選択中のブックマークをリネーム" @@ -6432,5 +6407,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." -msgstr "" +msgstr "経度の値は[-180,180]の範囲で必須です。" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 @@ -6472,9 +6447,4 @@ msgid "Download Area" msgstr "エリアをダウンロードする" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "ダウンロード" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6773,6 +6743,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6785,6 +6753,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -7055,4 +7021,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7275,5 +7245,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7316,116 +7286,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "名前" @@ -7449,15 +7419,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "タイプ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "近く" @@ -7633,11 +7603,11 @@ msgstr "履歴をサーバからリロード" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" "履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7645,5 +7615,5 @@ msgstr "参照の設定に失敗。参照ID {0} は履歴ID {1} と一致しません。" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7651,9 +7621,9 @@ msgstr "参照のセットに失敗しました。参照バージョン {0} は履歴で利用できません" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "履歴がまだ初期化されていません。現在のプリミティブのセットに失敗。" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7769,6 +7739,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "不明な" @@ -7791,13 +7761,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Changeset info" msgstr "変更セット情報" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Launch browser with information about the changeset" msgstr "変更セットについての情報とともにブラウザを起動" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7832,4 +7802,136 @@ msgstr "バージョン" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "ノード {0} だけを同期" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "ウェイ {0} だけを同期" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "リレーション {0} だけを同期" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "データセット全体を同期" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"アップロード失敗: サーバーはあなたのノード・ウェイ・リ" +"レーションのどれかに、
もっと新しいバージョンのものを持っているようです。" +"
この競合は、id {1} の {0} でおきまし" +"た。
サーバーにあるバージョンは {2} で、あなたのは {3} です。

競合" +"したプリミティブのみを同期させるには、{4}をクリックしてくだ" +"さい。
全ローカルセットを同期させるには、{5} をクリック" +"してください。
中止して編集を継続するには、{6} をクリック" +"してください。
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "競合が検出されました" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"アップロード失敗: サーバーはあなたのノード・ウェイ・リ" +"レーションのどれかに、
もっと新しいバージョンのものを持っているようです。" +"
全ローカルセットを同期させるには、{0} をクリックしてくだ" +"さい。
中止して編集を継続するには、{1} をクリックしてくだ" +"さい。
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"アップロード 失敗: あなたが
チェンジセット {0} を使" +"用しています。それはすでに {1} に閉じられましたので、
もう一度新規または既" +"に開いている変更セットをアップロードしてください。" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "変更セットは閉じられました" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "競合解決の準備" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "クリックしてノード {0}用の全ての親ウェイをダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "クリックしてキャンセル後に地図編集を再開" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" +"アップロード 失敗 ウェイ {1} が使用中のノード {0} を削" +"除しようとしました。

{2} をクリックしてノード {0} の" +"全ての親ウェイをダウンロードしてください。
必要ならJOSM は競合解決ダイアロ" +"グで解決できる競合として作成します。" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "ノードはまだ使用中です" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "警告: エラーヘッダ \"{0}\" は想定されたパターンに一致しません" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "アップロードする変更の概略コメントを入力してください。" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "アップロード用コメントを入力(最小3文字)" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7848,39 +7950,152 @@ msgstr "開かれている変更セットなし" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "新しい変更セットを開く" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "新しい変更セットを開き、次回アップロードで使用" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "変更セットを更新中..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "既に開かれた変更セットにデータをアップロード" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "アップロード後に変更セットを閉じる" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "次回アップロード後に閉じる「変更セット」を選択" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "自分の開いた変更セットのリストをサーバからロード" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "現在選択済みの開かれた変更セットを閉じる" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "閉じる変更セットを選んでください" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "変更セットを開く" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "変更セットを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "選択済みの開かれた変更セットを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "変更セットを閉じる操作をキャンセル" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "変更セットを閉じています" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "変更セット {0} を閉じています" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +#, fuzzy +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" +"警告: オプションペインダイアログを常時トップに表示するのに失敗しました。例外" +"コード: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "ユーザーとパスワードを保存します(暗号化されません)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "あなたのユーザ名を入力してください" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "あなたのトレースについて属性タグを記入して下さい" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "警告:パスワードは暗号化されずに送信されます。" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "アスレチック" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "ジャンクションに到達" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "ファイルを選ぶためにファイル選択を起動してください" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "ファイル名を選択" @@ -7950,17 +8165,17 @@ msgstr "レイヤーを ''{0}'' に保存中..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "未保存の変更 - 終了前に保存/アップロード？" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "未保存の変更 - 削除前に保存/アップロード？" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "修正されたレイヤーをアップロード、保存中 ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7974,9 +8189,9 @@ "てください。
競合のあるレイヤー:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "保存されていないデータと競合" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7992,9 +8207,9 @@ "ヤー:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "保存されていないデータと不明な関連ファイル" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -8011,50 +8226,50 @@ "い。
書き込み不可のファイルのあるレイヤー:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "書き込み不可なファイルのためデータはセーブされませんでした" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "ダイアログを閉じてJOSMでの編集に戻る" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "変更を破棄して終了" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "保存せずにJOSM を終了" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "破棄して削除" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "保存せずにレイヤーを削除。未保存の変更は失われます。" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "保存/アップロードして終了" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "保存せずにJOSM を終了。未保存の変更はアップロード、保存されます。" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "保存/アップロードして削除" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "削除前にレイヤーを保存/アップロード。未保存の変更は失われます。" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "レイヤー ''{0}'' のアップロード準備中 ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -8064,5 +8279,5 @@ "敗しました。" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "不完全なアップロードと保存" @@ -8135,40 +8350,389 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "アップロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "オブジェクトを更新" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "設定" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "データのアップロード方法と使用する変更セットを決定" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "新しい変更セットのタグ" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "変更セットのデータのアップロード先にタグを適用" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "新しい変更セットを開き、次回アップロードで使用" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "高度" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "利用可能なプラグインを設定" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "レイヤー ''{0}'' へデータをアップロード中" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "変更のアップロード" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "変更されたプリミティブをアップロード" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "不正なアップロードコメント" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "アップロードをキャンセルして編集に戻る" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "変更セット {0} のタグ" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" +"警告: プリミティブの ''{0}'' は既にサーバから削除されています。このプリミ" +"ティブをスキップし、アップロードを再試行します。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "プリミティブアップロード準備中" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, fuzzy, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +"{0} オブジェクト を{1} リレーション " +"から削除して良いか確認してください。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "レイヤー ''{0}'' へデータをアップロード中" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "アップロードを続ける" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +#, fuzzy +msgid "Click to return to the Upload Dialog" +msgstr "クリックしてダイアログを閉じる" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "情報" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "クリックしてノードのマージを中断" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "アップロードするオブジェクトを選択" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "変更セット情報" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェク" +"トをスキップしてもう一度アップロードします。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" +"オブジェクト ''{0}'' は既に削除されています。アップロード中のオブジェクトをス" +"キップします。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "{0} オブジェクトをアップロード中 ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "アップロードがキャンセルされたため捕捉した例外を無視します。例外: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" +"現在の選択から修正されたオブジェクトをマークしてサーバ" +"にアップロード。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" +"ローカルで削除されたオブジェクトをマークしてサーバから" +"削除。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "アップロードするオブジェクトを選択" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "アップロードをキャンセル" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "削除する列を選択してください。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "新しい変更セットを開き、次回アップロードで使用" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "追加するオブジェクト:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "修正するオブジェクト:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "削除するオブジェクト:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8176,5 +8740,5 @@ msgstr[0] "{0} 個のオブジェクトを加えてください:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8183,5 +8747,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8189,216 +8753,37 @@ msgstr[0] "{0} 個のオブジェクトを削除:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "変更のアップロード" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "変更されたプリミティブをアップロード" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "不正なアップロードコメント" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "最初に目的の座標を入力してください。" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "アップロードをキャンセルして編集に戻る" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "アップロードする変更の概略コメントを入力してください。" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "アップロード用コメントを入力(最小3文字)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "新しい変更セットを開く" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "新しい変更セットを開き、次回アップロードで使用" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "開かれた変更セットを使用" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "既に開かれた変更セットにデータをアップロード" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "アップロード後に変更セットを閉じる" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "次回アップロード後に閉じる「変更セット」を選択" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "変更セット {0} のタグ" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "自分の開いた変更セットのリストをサーバからロード" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "現在選択済みの開かれた変更セットを閉じる" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "変更セットID > 0 であるべきです。入力値: {0}" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"警告: プリミティブの ''{0}'' は既にサーバから削除されています。このプリミ" -"ティブをスキップし、アップロードを再試行します。" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "プリミティブアップロード準備中" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" -"現在の選択から修正されたオブジェクトをマークしてサーバ" -"にアップロード。" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" -"ローカルで削除されたオブジェクトをマークしてサーバから" -"削除。" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "アップロードするオブジェクトを選択" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "アップロードをキャンセル" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "アップロードを続ける" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "警告: プレセットの設定を ''{0}''とするのに失敗しました。" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "ひとつのリクエストで全ての変更をアップロード" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "不正な要求" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} メータ" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "フィルター文字列を入力してください。" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, fuzzy, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" -"ファイル ''{0}'' には書き込めません。他のファイル名を入力してください。" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "GPSポイント" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "線描画のカスタマイズ" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "全体設定を使用" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "このレイヤーの点の間に線を引く。" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "このレイヤーの点の間に線を引かない。" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "線描画オプションの選択" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8406,5 +8791,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8413,5 +8798,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8492,5 +8877,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "説明" @@ -8520,10 +8905,10 @@ msgstr[0] "{0} ウェイポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "データレイヤーへ変換" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8534,12 +8919,12 @@ "てください：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8548,29 +8933,29 @@ msgstr "{0}からのコンバート" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "このトラックに沿ってOSMからダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "次の範囲内の全てをダウンロード:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} メータ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "リクエストあたりの最大面積：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} 平方キロメートル" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8581,9 +8966,9 @@ "すか？" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8593,5 +8978,5 @@ "に変更又は移動されました。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8601,23 +8986,23 @@ "外します。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "データレイヤー {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "ダウンロード領域の外" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "バージョン {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8625,5 +9010,5 @@ msgstr[0] "検出された競合が {0} 個あります" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8637,5 +9022,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8648,11 +9033,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "クリックしてこのダイアログを閉じ、編集を続ける" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8660,36 +9045,36 @@ msgstr[0] "{0} を削除しました" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0}は次からなります:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "設定解除" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "APIバージョン: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "GPXレイヤーの変換" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "データセット一貫性テスト" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "問題はありませんでした" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "次の問題が見つかりました:" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8700,5 +9085,5 @@ "よ :" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8706,10 +9091,10 @@ msgstr[0] "トラック" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" msgstr[0] "ポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8717,5 +9102,5 @@ msgstr[0] "{0}ポイントをもつトラック" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8723,5 +9108,5 @@ msgstr[0] "{1}トラックを含む {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8729,24 +9114,24 @@ msgstr[0] "{0} ポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPXファイル(*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "ファイル {0} は、\"{1}\"という名前でですが、読み込まれました。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "{0}の解析中にエラー" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "\"{0}\"を読み込めません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8758,34 +9143,34 @@ "を読み取って、タイムゾーンを選択します。

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "写真の時刻(exifから取得):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "(写真から読み取った)GPSの時刻: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "タイムゾーンの選択: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "日付なし" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "他の写真を開く" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "GPSレシーバーの写真から時刻を同期" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8795,71 +9180,160 @@ "入力する形式を確認してください。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "不正な日付" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPXトラック: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "ほかのGPXトレースを開く" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "自動推測" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "次の場所を更新： " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "タイムゾーン: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "オフセット:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"私のGPSレシーバーは写真を撮ることができます。
これは使えますか。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "次の場所を更新： " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "すべての画像" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "exif位置のついていない画像" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "まだタグ付けされていない画像" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "何も選択されていません！" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "{0}／{1} 枚の写真がGPXトラックにマッチしました。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "GPXトラックに画像を関連づけます。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "関連付け" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "自動推測" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "不正なタイムゾーン" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "不正なオフセット" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "トレース" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "タイムゾーン: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "分: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "秒: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(時差 {0} 日)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" +"GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照" +"合できます。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "トラックへのフォトマッチに失敗しました。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "タイムゾーンとオフセットを調整してください。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "選択した写真には時間情報がありません" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "写真は時間情報を含んでいません。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択" +"してください。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPXトラックは、時間情報を持っていません。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "GPXトラックを選択しなければなりません" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "GPXトラックの選択がありません" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8870,9 +9344,5 @@ "期待する形式: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "不正なタイムゾーン" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8883,190 +9353,156 @@ "期待されるフォーマット: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "不正なオフセット" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "GPX トラック {2} に、{1}中に{0}枚発見しました。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPXトラックが読み込まれました" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "選択した写真には時間情報がありません" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "写真は時間情報を含んでいません。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択" -"してください。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPXトラックは、時間情報を持っていません。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "タイムゾーン: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "分: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "秒: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "{0}／{1} 枚の写真がGPXトラックにマッチしました。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(時差 {0} 日)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" -"GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照" -"合できます。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "トラックへのフォトマッチに失敗しました。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "タイムゾーンとオフセットを調整してください。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "デフォルトの値" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "EXIFからGPS位置を取得" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "ディレクトリ走査の開始" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "選択されたファイルのひとつがヌルでした" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "写真を取り込む" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "{0}を読み込んでいます ..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "標準的なディレクトリへのパスを入手できません {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "ディレクトリ {0} を走査" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "ディレクトリからファイルを入手中のエラー {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "ジオタグのついた画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "GPXに関連づける" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" msgstr[0] "画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} は gps タグがつけられていることがわかりました。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "常に移動し、ダイアログ表示は不要" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "ファイルは存在しませんでした。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "画像なし" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "{0} 読み込み中です" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "ファイル{0}にエラー" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "ジオタグされた写真の表示" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "前へ" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "前の画像" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "ウェブページ: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "レイヤーから写真を削除しますか？" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "関連から削除" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "次へ" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "次の画像" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "中央表示" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "最適な等倍表示" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -9077,5 +9513,5 @@ "高度: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9176,4 +9612,12 @@ msgid "Error displaying URL" msgstr "URL を表示する際にエラー" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9398,7 +9842,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "全て" @@ -9469,6 +9912,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "自転車" @@ -9858,31 +10301,93 @@ msgstr "投影法 {0} は、有効化できませんでした。メルカトル図法を使います。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "プロキシーサーバを有効" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "匿名" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "ホステル" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "ポート:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "パスワード" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "プロキシー設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "プロキシーサーバのホスト名" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "プロキシーサーバのポート" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "プロキシーのユーザ名" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "プロキシーのパスワード" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "OSMサーバのベースURL（REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "OSM アカウントへのログイン名(e-mail)。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "サーバのベースURL" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "OSM ユーザ名 (e-mail)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSMパスワード" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"警告: パスワードは設定ファイルに平文で保管されています。
パスワード" +"はサーバに平文で、URLエンコードされて送信されます。
重要なパスワードは" +"使用しないでください。" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10185,5 +10690,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10192,13 +10697,13 @@ msgstr[0] "{0} オブジェクトまで古いキーを削除" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "新しいタグを追加" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "タグテーブルの選択を削除" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10206,18 +10711,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "オプションの属性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "閉じたウェイ" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "不明なタイプ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10228,16 +10733,16 @@ msgstr "タグ付けプレセットのソース {0} を読み込めません。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "走査時にエラー: {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "タイプ{0}の要素がサポートされます" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10245,18 +10750,18 @@ msgstr[0] "{0}このオブジェクトを変更" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "何も選択されていません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "選択が適切ではありません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "プリセットの適用" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "プロパティを変更する" @@ -10285,4 +10790,12 @@ msgstr "{1}にポイント{0}をダウンロード中..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +#, fuzzy +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "XML タグ ''{1}'' の属性 ''{0}'' に不正な値。入力値: {2}。" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10298,12 +10811,70 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。" - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "データを準備中..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, fuzzy, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" +"変更されたプリミティブ ''{0}'' の新しいバージョンに予期せぬ形式。入力値: " +"''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +#, fuzzy +msgid "Parsing response from server..." +msgstr "ネームサーバに問合せ中 ..." + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "予想外のカラム番号 {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10406,10 +10977,10 @@ msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "不明なモード {0}。" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -10418,6 +10989,6 @@ "不明" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10427,40 +10998,40 @@ msgstr "OSMデータをダウンロード中..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "id {0} のノードを ''{1}'' から取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "id {0} のウェイを ''{1}'' から取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "id {0} のリレーションを ''{1}'' から取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "ID {0} に対してサーバが404コードを返しました。スキップします。" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "''{0}'' からノードのパッケージを取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "''{0}'' からウェイのパッケージを取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "''{0}'' からリレーションのパッケージを取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10470,9 +11041,10 @@ "行中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "リレーション''{0}'' をダウンロード中" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10509,34 +11081,32 @@ msgstr "NMEAのインポートに失敗しました。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, fuzzy, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." msgstr "設定 ''{0}'' がみつかりません。OsmApi を初期化できません" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "このバージョンのJOSMは、設定されたサーバーと互換性がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"これは、プロトコールバージョン 0.5 と 0.6 をサポートしていますが、サーバー" -"は、 {0} から {1}をサポートするといっています。" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "予想外の形式のID がサーバから返されました。入力値: ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10546,66 +11116,77 @@ "''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "変更セットを作成しています..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "変更セット {0} を開きました" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "変更セットID > 0 であるべきです。入力値: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "変更セットを更新中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "変更セット {0} を更新中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "変更した設定を閉じています..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "diffアップロードのための変更セットを用意できませんでした。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "準備中..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "アップロード中..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "ひとつのリクエストでアップロード開始..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "{0} オブジェクトをアップロード中 ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "10秒待機中 ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "{2} 秒で {1} 分の {0} 回の再試行を開始 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "OK - やり直しています。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "{1} 分の {0} 回の再試行を開始。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "現在の変更セットはヌルです。データをアップロードできません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "現在の変更セットのID > 0 でなければなりません。現在のID: {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10634,4 +11215,14 @@ msgid "Invalid bz2 file." msgstr "不正なbz2 ファイル。" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10642,5 +11233,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10667,5 +11258,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10673,5 +11264,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10685,5 +11276,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10694,60 +11285,6 @@ msgstr "変更セットのリストを解析中..." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "正しくないパスワードかユーザ名です。" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "警告:パスワードは暗号化されずに送信されます。" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "ユーザーとパスワードを保存します(暗号化されません)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "パスワードを入力して下さい" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "ログイン" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "OSMサーバのベースURL（REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "OSM アカウントへのログイン名(e-mail)。" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "サーバのベースURL" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "OSM ユーザ名 (e-mail)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSMパスワード" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"警告: パスワードは設定ファイルに平文で保管されています。
パスワード" -"はサーバに平文で、URLエンコードされて送信されます。
重要なパスワードは" -"使用しないでください。" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10840,5 +11377,12 @@ msgstr "ファイル \"{0}\" はありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10849,39 +11393,39 @@ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr " 要素を直接引き継いでない XML 要素の が見つかった。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "ウェイ {1} の上に必要な属性 ''{0}'' がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "要素 の属性 ''ref'' に不正な値。入力値: {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" "要素 の直接の子要素でないXML 要素 が見つかりました。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10890,19 +11434,19 @@ "リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "ref=0の不完全な指定です。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "入力ストリーム中に未定義の要素 ''{0}'' があります。スキップします。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "id=0の禁じられたオブジェクトです" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10912,8 +11456,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10925,25 +11469,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "ID {0} のOSM プリミティブ「の属性 ''version'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "XML タグ ''{1}'' の属性 ''{0}'' に不正な値。入力値: {2}。" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "属性 ''uid'' に不正な値。入力値: ''{0}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "必要な属性 ''{0}'' がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10952,5 +11512,5 @@ "外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10961,5 +11521,5 @@ "ドが見つからないため、不完全です。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10968,5 +11528,5 @@ "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10977,13 +11537,13 @@ "しています。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "OSMデータを準備します…" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "OSMデータ解析中..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "データセット準備中..." @@ -11006,20 +11566,31 @@ msgstr "参照リレーションをダウンロード中" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "変更セットを読み込んでいます..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "変更セットをダウンロード中 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "変更セット {0} を読み込んでいます ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." +msgstr "変更セット {0} をダウンロード中 ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "変更セットをダウンロード中 ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." msgstr "変更セット {0} をダウンロード中 ..." @@ -11039,7 +11610,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -11048,9 +11619,5 @@ msgstr "API {0} への接続に失敗しました" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "エラー: 接続する認証信任状の追加に失敗。" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11102,21 +11669,25 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 -#, fuzzy msgid "Starting to upload in chunks..." -msgstr "ひとつのリクエストでアップロード開始..." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format msgid "({0}/{1}) Uploading {2} objects..." -msgstr "{0} オブジェクトをアップロード中 ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "データアップロード中 ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "削除または移動されたプリミティブ" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11157,12 +11728,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "削除 {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Error deleting plugin file: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11310,9 +11881,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "説明がありません" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "もっと詳細" @@ -11444,4 +12015,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11780,6 +12366,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "トレースのアップロード" @@ -11865,5 +12451,5 @@ msgstr "GPXトラックのアップロード" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "openstreetmap.org へトレースをアップロード" @@ -11874,5 +12460,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "アドレスの補間" @@ -11887,11 +12473,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "奇数" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "偶数" @@ -11902,24 +12485,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "数" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "自然" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "サイト" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "レンタル" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11937,7 +12516,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "内側のセグメント" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -12003,7 +12581,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 -#, fuzzy msgid "Expected valid number for address increment" -msgstr "奇数番号のアドレスが期待されている" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 @@ -12053,5 +12630,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "用紙選択" @@ -12115,21 +12692,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "コミューンの選択" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "選択..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "自動ソーシング" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12141,13 +12718,13 @@ "F11 を取得アクションに戻しますか？" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "F11 を取得ショートカットに戻す" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "変更が実施されるようにJOSM を停止しました" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12174,17 +12751,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "地理参照中にイメージ切り抜きを無効化" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "自動キャッシュを有効にする" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "最大キャッシュサイズをMB単位で指定します。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12201,18 +12778,18 @@ "CU_01_ConditionsGenerales_fr.html" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "French cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "可能な場合、キー \"source\" の値を自動化" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "情報ソース" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12220,5 +12797,5 @@ msgstr "元の白い背景をJOSMの設定で定義した色の背景に置き換え" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12227,52 +12804,49 @@ "元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "複数レイヤーの重ね合わせを許可します。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "WMSレイヤーを透明にします。右が不透明、左が透明です。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "WMSサーバからダウンロードしたデータの周囲に長方形を描画します。" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "ベクタイメージ取得倍率:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "より小さい画像を取得してください。(より高品質だがよりメモリを使う)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "固定サイズ正方形（初期値は100メートル）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "固定サイズ（25～1000メートル）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "ラスタイメージ取得倍率:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "このサイズを超えると古いファイルは自動的に削除されます" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "自動タグのソースを追加しました。:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "\"source=...\" を要素に追加しますか？" @@ -12490,5 +13064,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "ロケーション" @@ -12688,5 +13262,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "データが読み込まれていません。" @@ -12708,9 +13282,9 @@ msgstr "匿名時間も含めたGPXレイヤーへのコンバート" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "gpxトラックを編集してください。" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "Gpx編集" @@ -13100,7 +13674,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "水域(湖沼)" @@ -13255,19 +13829,19 @@ msgstr "イメージを取得できませんでした" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "接続中です" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "接続しました" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "接続していません" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "接続失敗" @@ -13306,32 +13880,32 @@ msgstr "LiveGPSレイヤー" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "GPSトラックの取り込み" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "gpsdサーバに接続し、LiveGPSレイヤーに現在位置を表示します。" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "一回中央寄せ" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "現在の位置をLiveGPSのレイヤーの中心にする。" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "自動中心設定" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "現在の位置にLiveGPSレイヤーを引き続き中央寄せする。" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13382,9 +13956,9 @@ msgstr "世界の外を描くことはできません。" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "測定モード" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "測定" @@ -13422,5 +13996,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13431,13 +14005,13 @@ msgstr "マルチポリゴンを作成。" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "選択されたウェイのひとつは既に別のマルチポリゴンの一部です。" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "マルチポリゴンはクローズドウェイだけから構成されていなければなりません" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "少なくとも2つのウェイを選択してください。" @@ -13591,5 +14165,5 @@ msgstr "Firefoxの実行ファイル" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13687,5 +14261,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13761,41 +14335,41 @@ msgstr "重みの値の入力" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "スリッピーマップ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "自動ズーム" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "タイルの読み込み" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "タイル情報を表示" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "全てのタイルをロード" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "ズームアップ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "ズームダウン" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "タイルのキャッシュをフラッシュ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "画像 " @@ -13964,4 +14538,43 @@ msgstr "まず、設定情報にあるタグ付けプレセットのソースを指定してください。" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "偶数" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "最も小さな番号" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "最も大きな番号" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "ストリート" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "最も大きな番号" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13980,42 +14593,20 @@ msgstr "テラスを反転" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "建物のテラス" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "長い建物から個別の建物を生成" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "最低4ノード以上の単一のクローズドウェイを選択" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "テラスハウス" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "最も大きな番号" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "最も小さな番号" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "補間" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "ストリートの名前" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "オプション" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14030,5 +14621,5 @@ msgstr "妥当性検証エラー" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "グリッド" @@ -14687,38 +15278,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "建物" @@ -14732,5 +15293,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "領域" @@ -14849,10 +15410,10 @@ msgstr "walking-papers.org からの情報を読み取れませんでした。idは \"{0}\"" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Walking Papers: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -14888,4 +15449,5 @@ msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" +"ノード ''{0}'' に接続されたウェイはありません。異常終了します。" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:167 @@ -14917,5 +15479,5 @@ #, java-format msgid "Node ''{0}'' is a junction with more than 2 connected ways." -msgstr "" +msgstr "ノード ''{0}'' は2以上のウェイが接続されたジャンクションです。" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 @@ -15603,6 +16165,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "道路番号" @@ -16048,5 +16610,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "幅(m)" @@ -16164,5 +16726,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "金属" @@ -16174,5 +16736,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "森" @@ -16430,4 +16992,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16459,8 +17024,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "はい" @@ -16608,9 +17175,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "いいえ" @@ -16855,5 +17423,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "居住区域内道路" @@ -16888,5 +17456,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "敷地内道路" @@ -16920,6 +17488,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "工事中" @@ -16969,5 +17537,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "ロータリー交差点" @@ -17155,6 +17723,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "ハイキング" @@ -17275,5 +17843,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17299,4 +17866,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17306,15 +17874,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "操作員" @@ -17526,7 +18094,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "高度" @@ -17948,5 +18516,5 @@ msgstr "湿地" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17956,5 +18524,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "沼地、湿地" @@ -18480,32 +19048,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "営業時間" @@ -18564,91 +19132,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "24/7" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "月-金 08:30-20:00" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "火-日 08:00-15:00; 土 08:00-12:00" @@ -18663,5 +19231,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18680,7 +19248,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "参照番号" @@ -18696,5 +19264,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "地下" @@ -18707,6 +19275,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "料金" @@ -18745,22 +19313,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "自動車パーツショップ" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "自動車パーツショップの編集" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "自動車修理" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "自動車修理工場の編集" @@ -18768,5 +19324,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "レンタル" @@ -18775,10 +19331,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "レンタカーの編集" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "自家用車共有" @@ -18786,5 +19342,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "カーシェアリング" @@ -18792,10 +19348,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "駐輪場の編集" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "収容台数" @@ -18804,22 +19360,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "自転車レンタルの編集" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "自転車ショップの編集" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "公共交通機関" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18829,5 +19378,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18835,5 +19384,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Reference" @@ -18841,5 +19390,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "停車場" @@ -18847,5 +19396,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "停止線の編集" @@ -18853,5 +19402,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "トラム停車場" @@ -18860,5 +19409,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "トラム停車場の編集" @@ -18866,5 +19415,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "鉄道のプラットホーム" @@ -18873,5 +19422,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "鉄道のプラットホームの編集" @@ -18883,5 +19432,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "リファレンス (ホームの番号)" @@ -18889,10 +19438,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "エリア" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "地下鉄の入口" @@ -18901,10 +19450,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "地下鉄入口の編集" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "車いす" @@ -18913,5 +19462,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "バスターミナル" @@ -18920,5 +19469,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "バスターミナルの編集" @@ -18926,5 +19475,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "バス停" @@ -18934,5 +19483,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "バス停の編集" @@ -18941,17 +19490,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "避難所" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "ベンチ" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "バス乗り場" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "バス乗り場の編集" @@ -18959,5 +19516,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "タクシー" @@ -18965,5 +19522,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "タクシー乗り場の編集" @@ -18971,5 +19528,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "空港" @@ -18977,15 +19534,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "空港の編集" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18993,10 +19550,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "旅行" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "宿泊施設" @@ -19008,5 +19565,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "ホテル" @@ -19015,15 +19572,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "ホテルの編集" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "星の数" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "モーテル" @@ -19031,20 +19588,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "モーテルの編集" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "ゲストハウス" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "ゲストハウスの編集" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "シャレー風の別荘、シャレー" @@ -19052,10 +19609,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "シャレー風の別荘の編集" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "ホステル" @@ -19063,30 +19620,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "ホステルの編集" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "山小屋" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "山小屋の編集" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "ハウストレーラー用駐車場" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "ハウストレーラー用駐車場の編集" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "キャンプ場" @@ -19094,10 +19651,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "キャンプ場の編集" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "飲食店" @@ -19108,5 +19665,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "レストラン" @@ -19114,5 +19671,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "レストランの編集" @@ -19120,5 +19677,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "料理の種類" @@ -19126,61 +19683,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "イタリアン" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "中国料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "ピザ" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "バーガー" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "ギリシャ料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "ドイツ料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "インド料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "郷土料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "カバブ" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "トルコ料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "アジア各国料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "タイ料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "メキシコ料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "日本食" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "ファーストフード" @@ -19188,9 +19745,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "ファーストフード店の編集" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "カフェ" @@ -19198,9 +19755,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "カフェの編集" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "パブ、居酒屋" @@ -19208,18 +19765,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "パブの編集" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "ビアガーデン" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "ビアガーデンの編集" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "バー" @@ -19227,9 +19784,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "バーの編集" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "ナイトクラブ" @@ -19237,24 +19794,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "ナイトクラブの編集" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "旅行" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "アトラクション" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "アトラクションの編集" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "博物館" @@ -19262,9 +19819,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "博物館の編集" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "動物園" @@ -19273,9 +19830,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "動物園の編集" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "観覧台" @@ -19283,24 +19840,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "View pointの編集" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Look-Out Tower" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "テーマパーク" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "テーマパークの編集" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "美術館" @@ -19308,5 +19865,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "美術館の編集" @@ -19314,19 +19871,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "案内所" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "マップ" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "詳細なグレード" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "地形" @@ -19364,5 +19921,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19370,28 +19927,28 @@ msgstr "ストリート" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "スキーム" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "表示されたエリア" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "サイト" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "市区" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "地方" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "詳細な説明" @@ -19401,5 +19958,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "表示されたルート:" @@ -19407,6 +19964,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "サイクリング" @@ -19414,5 +19971,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "マウンテンバイク" @@ -19420,6 +19977,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "スキー" @@ -19427,5 +19984,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "乗馬" @@ -19433,46 +19990,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "... 他の可能な輸送モード" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "情報板" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "掲示板の内容" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "通知" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "履歴" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "自然" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "野生生物" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "植物" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "道しるべ" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "情報端末" @@ -19480,29 +20037,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "詳細な説明" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1769 msgid "Audioguide" msgstr "音声ガイド" #. -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" msgstr "携帯電話経由の音声ガイド？" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 +#: build/trans_presets.java:1780 msgid "Phone number" msgstr "電話番号" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "その他の情報ポイント" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "シェルターの編集" @@ -19510,25 +20067,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "野外炉" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "ピクニック場(野外調理場)" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "ピクニック場の編集" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "史跡" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "城" @@ -19537,19 +20094,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "城の編集" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "遺跡" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "遺跡(ruins)の編集" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "遺跡（群）" @@ -19558,9 +20115,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "遺跡（群）の編集" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "戦場跡" @@ -19568,32 +20125,32 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "戦場跡の編集" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" -msgstr "" +msgstr "古生物のサイト" #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" -msgstr "" +msgstr "古生物のサイトを編集" #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "記念塔(モニュメント)" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "モニュメントの編集" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "記念碑(戦争記念などの)" @@ -19601,55 +20158,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "記念碑の編集" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "道路際の十字架" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "道路際の十字架の編集" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "道祖神" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "道祖神の編集" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "境界石" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "境界石を編集" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "レジャー" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "遊泳用プール" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "遊泳用プールの編集" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "遊び場" @@ -19657,35 +20214,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "運動公園の編集" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "つり" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "つりの編集" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "スポーツ" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "スポーツ施設" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "スタジアム" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "スタジアムの編集" @@ -19699,6 +20256,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "スポーツ選択：" @@ -20090,30 +20647,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "スポーツ" @@ -20123,225 +20680,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "多目的" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "アーチェリー" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "アスレチック" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "オーストラリアフットボール" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "野球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "バスケットボール" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "ペタンク" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "ボーリング" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "カヌー" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "登山" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "クリケット" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "クリケットネット" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "クローク" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "サイクリング" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "ドッグレース" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "乗馬" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "フットボール" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "ゴルフ" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "体操" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "ホッケー" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "競馬" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "モータースポーツ" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "ペロタ" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "ラケットボール" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "ラグビー" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "射撃" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "スケートボード" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "スケート" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "スキー" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "サッカー" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "水泳" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "卓球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "テニス" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "スポーツセンター" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "スポーツセンターの編集" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "運動場" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "運動場の編集" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "競技トラック" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "競技場のトラックの編集" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "ゴルフコース" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "ゴルフコースの編集" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "ミニチュアゴルフ" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "ミニチュアゴルフの編集" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "スポーツ" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "多目的" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Multiの編集" @@ -20380,21 +20937,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "タイプ" @@ -20433,203 +20990,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "運動場" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "スポーツセンター" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "スタジアム" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "トラック" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "テンピンズ" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "テンピンズの編集" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "アスレチック" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "アスレチック場の編集" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "アーチェリー" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "アーチェリーの編集" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "登山" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "登山の編集" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "カヌー・競艇" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "競艇場の編集" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "サイクリングの編集" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "ドッグレース" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "ドックレースの編集" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "乗馬" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "乗馬の編集" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "競馬" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "競馬場の編集" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "体操" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "体操競技の編集" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "モータースポーツ" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "モータースポーツの編集" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "スケート" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "スケート場の編集" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "スケートボード" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "スケートボードの編集" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "水泳" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "水泳の編集" @@ -20637,56 +21194,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "スキーの編集" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "ゲレンデのタイプ" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "ダウンヒル" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "ノルディックスキー" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "スノーパーク" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "難易度" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "初心者" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "初球" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "中間" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "高度" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "エキスパート" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "ただ乗り" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "射撃" @@ -20694,127 +21251,127 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "射撃の編集" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "球技" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "サッカー" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "サッカー場の編集" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "フットボール" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "フットボール場の編集" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "オーストラリアフットボール" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "オーストラリアフットボールの編集" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "野球" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "野球場の編集" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "バスケットボール" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "バスケットボール場の編集" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "ゴルフ" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "ゴルフの編集" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "ゴルフコース" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "ペタンク" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "（ペタンクの）ブールの編集" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "ボーリング" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "ボーリング場の編集" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "クリケット" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "クリケットの編集" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "クリケットネット" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "クリケットネットの編集" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "クロッケー" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "クロッケーの編集" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "ホッケー" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "ホッケーの編集" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "ペロタ" @@ -20822,55 +21379,55 @@ # ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》. #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "ペロタの編集" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "ラケットボール" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "ラケットボールの編集" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "ラグビー" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "ラグビー場の編集" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "卓球" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "卓球の編集" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "テニス" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "テニスの編集" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "建造物" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "建物" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "建物" @@ -20878,5 +21435,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "公共の建物" @@ -20884,10 +21441,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "公共の建物の編集" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "役場" @@ -20895,10 +21452,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "役場の編集" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "大使館" @@ -20906,10 +21463,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "大使館の編集" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "裁判所" @@ -20918,10 +21475,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "裁判所の編集" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "刑務所" @@ -20930,10 +21487,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "刑務所の編集" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "警察" @@ -20943,10 +21500,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "警察署・交番の編集" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "消防署" @@ -20955,10 +21512,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "消防署の編集" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "郵便局" @@ -20966,5 +21523,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "郵便局の編集" @@ -20972,15 +21529,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "幼稚園" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "幼稚園の編集" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "学校" @@ -20988,10 +21545,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "学校の編集" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "大学" @@ -20999,10 +21556,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "大学の編集" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "短大" @@ -21010,5 +21567,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "短大の編集" @@ -21016,5 +21573,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "映画館" @@ -21023,10 +21580,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "映画館の編集" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "図書館" @@ -21035,9 +21592,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "図書館の編集" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "美術館" @@ -21045,10 +21602,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "美術館の編集" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "劇場" @@ -21057,10 +21614,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "劇場の編集" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "礼拝所" @@ -21070,5 +21627,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "礼拝所の編集" @@ -21077,6 +21634,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "宗教" @@ -21085,66 +21642,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "バハーイ教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "仏教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "キリスト教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "ヒンズー教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "ジャイナ教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "ユダヤ教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "ムスリム" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "シーク教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "降霊術士、イタコ" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "道教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "ユニテリアン" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "ゾロアスター教" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "宗派" @@ -21153,81 +21710,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "英国教会系" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "バプチスト" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "カトリック" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "福音派" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "ものみの塔、エホバの証人" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "ルター派" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "メソジスト派" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "モルモン" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "ギリシャ正教系" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "ペンテコステ派" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "長老派" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "プロテスタント" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "クエーカー教徒" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "シーア派" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "スンニ派" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "住所" @@ -21236,5 +21793,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "住所情報の編集" @@ -21242,5 +21799,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "番地" @@ -21248,20 +21805,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "家の名前" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "ストリートの名前" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "都市名" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "郵便番号" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "国コード" @@ -21270,5 +21832,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "住所の補間を編集" @@ -21276,61 +21838,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "番地付けルール" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "奇数" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "偶数" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "アルファベット順" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "人工物" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "工場" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "工場の編集" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "タワー" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "タワーの編集" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "塔の種類" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "通信用" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "観察" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "高さ(メートル)" @@ -21338,25 +21900,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "水道塔" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "水道塔の編集" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "ガスタンク" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "ガスタンクの編集" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "灯台" @@ -21364,10 +21926,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "灯台の編集" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "風車" @@ -21375,10 +21937,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "風車の編集" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "パイプライン" @@ -21387,37 +21949,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "パイプラインの編集" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "石油" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "ガス" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "下水" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "熱" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "どれかの実体" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "水中" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "地上" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "下水処理場" @@ -21427,10 +21989,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "下水処理場の編集" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "クレーン" @@ -21438,10 +22000,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "クレーンの編集" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "ビーコン" @@ -21449,10 +22011,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "誘導灯の編集" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "調査ポイント" @@ -21460,10 +22022,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "測点の編集" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "監視カメラ" @@ -21471,5 +22033,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "監視カメラの編集" @@ -21477,5 +22039,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "発電機" @@ -21485,35 +22047,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "発電機の編集" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "風" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "水力発電" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "火力発電" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "原子力" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "石炭" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "太陽光発電" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "変電所" @@ -21522,10 +22084,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "変電所の編集" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "発電サブステーション" @@ -21534,5 +22096,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "配電所の編集" @@ -21540,10 +22102,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "ライン参照" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "送電塔" @@ -21554,23 +22116,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "送電塔の編集" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "送電塔" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "電柱" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "塔の参照番号" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "送電線" @@ -21579,75 +22141,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "送電線の編集" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "線の種類" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "線" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "細い線" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "電圧" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "電線の電流量" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "電力線束のうち良導体の線の数" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "シングル" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "ダブル" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "３" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "４" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "各種設備" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "トイレ" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "備考" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "郵便ポスト" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "電話" @@ -21656,5 +22218,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "電話を編集" @@ -21662,5 +22224,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "コイン" @@ -21668,5 +22230,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "備考" @@ -21674,5 +22236,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "電子マネー" @@ -21680,5 +22242,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "デビットカード" @@ -21686,15 +22248,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "クレジットカード" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "テレフォンカード" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "リサイクル" @@ -21703,5 +22265,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "リサイクルステーションの編集" @@ -21709,68 +22271,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "バッテリー" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "カン" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "被服" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "ガラス" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "紙" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "スクラップ金属" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "ベンチ" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "背もたれ" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "素材" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "石" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "プラスチック" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "色" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "黒" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "茶" @@ -21841,39 +22398,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "緑" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "赤" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "青" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "グレー" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "白" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "席の数" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Hunting Stand" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Hunting Standの編集" @@ -21882,30 +22439,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "高さ" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "低い" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "半分" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "完全" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "隠す" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "ロック" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "噴水" @@ -21914,10 +22471,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "噴水の編集" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "飲料水" @@ -21926,10 +22483,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "飲料水の編集" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "赤ちゃんポスト" @@ -21937,33 +22494,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "赤ちゃんポストの編集" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "店舗" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "自動車パーツショップの編集" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "自転車ショップの編集" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "スーパーマーケット" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "スーパーマーケットの編集" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "薬品屋" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "薬品屋の編集" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "コンビニエンスストア" @@ -21971,9 +22552,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "コンビニの編集" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "キオスク" @@ -21981,27 +22562,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "キオスクの編集" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "本屋" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "本屋を編集" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "旅行代理店" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "旅行代理店の編集" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "自動販売機" @@ -22009,5 +22590,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "自動販売機の編集" @@ -22015,88 +22596,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "自動販売機" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "公共_交通_チケット" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "公共輸送計画" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "パーキングチケット" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "食料" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "飲料" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "甘味" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "たばこ" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "写真" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "ペットフード" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "新聞" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "おもちゃ" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "切手" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "携帯の契約" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "プリペイド携帯のチャージ" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "車" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "コンドーム" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "タンポン" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "糞袋" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "決済または会員用カード" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "精肉店" @@ -22104,9 +22685,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "精肉店の編集" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "パン屋" @@ -22114,9 +22695,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "パン屋の編集" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "生花店" @@ -22124,18 +22705,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "生花店の編集" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "オーガニック" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "オーガニック（有機）ショップの編集" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "酒屋" @@ -22143,54 +22724,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "酒屋の編集" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "飲料店" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "酒屋(飲み物屋)の編集" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "コンピュータ店" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "コンピュータ店の編集" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "家電店" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "家電店の編集" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "オーディオショップ" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "オーディオショップの編集" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "家具店" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "家具店の編集" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "園芸用品店" @@ -22198,9 +22779,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "園芸用品店の編集" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "金物屋" @@ -22208,9 +22789,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "金物屋の編集" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "DIYショップ" @@ -22218,54 +22799,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "DIYショップの編集" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "文具店" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "文具店の編集" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "美容院" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "美容院の編集" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "靴店" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "靴店の編集" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "おもちゃ屋" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "おもちゃ屋の編集" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "ビデオ" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "ビデオショップの編集" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "クリーニング店" @@ -22273,9 +22854,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "クリーニング店の編集" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "ランドリー" @@ -22283,9 +22864,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "ランドリーの編集" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "アウトドア店" @@ -22293,28 +22874,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "アウトドア店の編集" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "スポーツ店" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "メガネ屋" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "眼鏡屋の編集" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "お金" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "銀行" @@ -22322,14 +22903,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "銀行の編集" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "ATM" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "両替" @@ -22337,5 +22918,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "両替の編集" @@ -22343,15 +22924,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "ATMの編集" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "健康" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "医院" @@ -22359,18 +22940,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "医院の編集" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "歯科医院" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "歯科医院の編集" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "薬局" @@ -22378,5 +22959,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "薬局の編集" @@ -22384,9 +22965,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "調剤薬局" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "病院" @@ -22394,10 +22975,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "病院の編集" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "夜間急病センター" @@ -22406,5 +22987,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "夜間急病センターの編集" @@ -22413,20 +22994,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "ポイント数" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "ポイント名" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "電話番号" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)" @@ -22434,5 +23015,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "動物病院" @@ -22441,64 +23022,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "動物病院の編集" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "地理学" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "地名" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "大陸" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "大陸の編集" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "国(country)" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "国(country)の編集" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "州(state)" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "州(state)の編集" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "地方" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "地方の編集" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "郡" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "郡の編集" @@ -22506,15 +23087,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "市区" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "市区の編集" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "町" @@ -22522,10 +23103,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "町の編集" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "近郊住宅地" @@ -22533,25 +23114,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "近郊住宅地の編集" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "村" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "村の編集" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "小村落" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "小村落の編集" @@ -22559,5 +23140,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "地域" @@ -22565,10 +23146,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "地域の編集" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "島" @@ -22576,10 +23157,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "島の編集" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "小島" @@ -22587,5 +23168,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "小島を編集" @@ -22593,5 +23174,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "洞窟の入口" @@ -22599,10 +23180,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "洞窟の入口の編集" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "山頂" @@ -22610,10 +23191,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "山頂の編集" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "氷河" @@ -22621,10 +23202,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "氷河の編集" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "火山" @@ -22632,70 +23213,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "火山の編集" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "境界線" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "国境" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "国境の編集" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "行政区画" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "行政区画の編集" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Civil境界" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Civil境界の編集" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "地点名" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Political境界の編集" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "国立公園" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "国立公園の境界編集" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "土地利用" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "樹木・林" @@ -22704,15 +23285,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "樹木・林の編集" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "植物の名前" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "森" @@ -22721,5 +23302,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "森の編集" @@ -22727,17 +23308,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "針葉樹" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "広葉樹" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "混合林" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "森" @@ -22746,14 +23327,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "森の編集" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "自然保護区" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "自然保護区の編集" @@ -22761,25 +23342,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "ガレ場" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "ガレ場の編集" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "低木林" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "低木林の編集" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "山(Fell)" @@ -22787,10 +23368,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "山(Fell)の編集" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "荒れ地" @@ -22798,5 +23379,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "荒れ地の編集" @@ -22804,5 +23385,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "農家の庭" @@ -22811,45 +23392,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "農家の庭の編集" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "農地" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "農地の編集" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "牧草地" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "牧草地の編集" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "ぶどう園" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "ぶどう園の土地利用の編集" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "貸し農園" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "家庭菜園用地の編集" @@ -22857,25 +23438,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "庭園" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "庭園の編集" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "草地" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "草地の編集" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "里山" @@ -22883,10 +23464,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "里山利用区画の編集" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "共有地" @@ -22894,20 +23475,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "共有地の名前" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "公園" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "公園の編集" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "レクレーション広場" @@ -22915,5 +23496,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "レクレーション広場利用区画の編集" @@ -22921,15 +23502,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "住宅エリア" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "住宅用地の編集" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "墓所" @@ -22937,9 +23518,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "（教会・寺院にある）墓所の編集" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "共同墓地" @@ -22947,39 +23528,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "共同墓地の編集" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "小売り商業" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "小売商用地の編集" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "商用" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "商用地の編集" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "工業" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "工業地の編集" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "鉄道用地" @@ -22987,15 +23568,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "鉄道用地の編集" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "軍用" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "軍用地の編集" @@ -23003,55 +23584,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "工事中エリア" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "工事中用地の編集" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "利用されなくなった商業設備" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "利用されなくなった工業地の編集" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "未開発工業地" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "緑地の編集" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "埋め立てゴミ処理地" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "埋め立てゴミ処理地の編集" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "採石場" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "採石場の編集" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "マルチポリゴン" @@ -23061,5 +23642,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "マルチポリゴンを編集" @@ -23068,10 +23649,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "外側のセグメント" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "内側のセグメント" @@ -23079,5 +23660,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "右左折制限" @@ -23086,5 +23667,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "右左折制限の編集" @@ -23092,34 +23673,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "通行制限" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "左折禁止" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "右折禁止" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "直進禁止" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "Uターン禁止" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "右折のみ" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "左折のみ" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "直進のみ" @@ -23128,15 +23709,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "ウェイから" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "ノードかウェイを経由して" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "ウェイへ" @@ -23144,5 +23725,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "ルート" @@ -23151,5 +23732,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "ルート編集" @@ -23157,5 +23738,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "ルート種類" @@ -23227,24 +23808,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "自転車" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "バス" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "道" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "フェリー" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "スキー" @@ -23297,5 +23878,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23304,13 +23885,13 @@ msgstr "徒歩" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "ハイキング" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "トラム" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "迂回路" @@ -23324,10 +23905,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "地下鉄" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "シンボルの説明" @@ -23335,31 +23916,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "ネットワーク" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "ルート状態" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "案" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "代替路" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "一時的" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "接続" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "色 (16進法)" @@ -23368,30 +23949,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "ルートセグメント" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "前のセグメント" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "後方セグメント" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "停止点" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "前方の停止点" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "後方の停止点" @@ -23602,130 +24183,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23742,98 +24197,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "破棄された" @@ -24210,7 +24574,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "車線" @@ -24274,13 +24638,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "線路" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24296,5 +24739,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "敷地内道路" @@ -24308,5 +24751,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "浅瀬（洗い越し）" @@ -24327,5 +24770,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "転回所" @@ -24340,5 +24783,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "緊急アクセスポイント" @@ -24353,5 +24796,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "川岸" @@ -24365,5 +24808,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "小川" @@ -24377,5 +24820,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "ドック" @@ -24397,16 +24840,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "水道" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24503,4 +24934,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24569,13 +25007,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "人工物" @@ -24621,6 +25059,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24637,7 +25075,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "鉄道ポイント" @@ -24660,10 +25098,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "その他の軌道" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "高架鉄道" @@ -24699,11 +25137,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "古い軌道" #. color rail +#. #. 1 #. 50000 @@ -24744,6 +25183,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "空路" @@ -24757,5 +25196,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "駅" @@ -24777,5 +25216,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "空路（暗色）" @@ -24789,5 +25228,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "空路（明色）" @@ -24795,4 +25234,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24842,7 +25288,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "リフト" @@ -24859,5 +25305,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "初球者スキーコース" @@ -24872,5 +25318,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "中級者スキーコース" @@ -24885,5 +25331,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "上級者スキーコース" @@ -24898,5 +25344,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "熟練者用のゲレンデ" @@ -24911,5 +25357,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "フリースタイルのゲレンデ" @@ -24924,5 +25370,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "初心者スキーゲレンデ" @@ -25042,11 +25488,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "電力" @@ -25060,5 +25506,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "桟橋" @@ -25072,5 +25518,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "パイプライン" @@ -25198,12 +25644,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "レジャー" @@ -25217,5 +25680,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "マリーナ" @@ -25253,4 +25716,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25269,4 +25748,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25287,8 +25774,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "アメニティ" @@ -25390,10 +25879,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "アメニティ_交通" @@ -25647,5 +26136,5 @@ #. #. -#. +#. #. color health #. @@ -25791,4 +26280,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25808,23 +26305,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "アメニティ_信号" @@ -25856,6 +26353,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "信号_水域" @@ -25916,14 +26413,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "健康" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26270,5 +26767,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26291,5 +26787,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "店" @@ -26361,8 +26858,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "ホテル" @@ -26463,9 +26960,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "旅行関係" @@ -26553,9 +27050,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "史跡" @@ -26569,5 +27066,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "石切り場" @@ -26581,5 +27078,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "埋め立て地" @@ -26601,5 +27098,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "水たまり、窪地" @@ -26613,5 +27110,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "森" @@ -26625,5 +27122,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "農家の庭" @@ -26646,5 +27143,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "小売りの商用地" @@ -26658,5 +27155,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "工業地" @@ -26670,5 +27167,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "使用していない工業地" @@ -26682,5 +27179,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "緑地" @@ -26694,5 +27191,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "鉄道公園" @@ -26749,7 +27246,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "軍用地" @@ -26763,5 +27260,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "共同墓地" @@ -26774,5 +27271,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "山頂" @@ -26787,5 +27284,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "氷河" @@ -26799,5 +27296,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "火山" @@ -26852,8 +27349,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "自然" @@ -26867,5 +27364,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "低木" @@ -26879,5 +27376,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "荒地" @@ -26891,7 +27388,7 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" -msgstr "" +msgstr "森林エリア" #. color water @@ -26903,5 +27400,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "泥" @@ -26915,5 +27412,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "砂浜" @@ -26991,8 +27488,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "ルート" @@ -27040,7 +27537,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "行政区境" @@ -27190,11 +27687,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "場所" @@ -27242,6 +27739,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "住所" @@ -27559,5 +28056,5 @@ #: build/trans_wms.java:35 msgid "7th Series (OS7)" -msgstr "" +msgstr "7番目のシリーズ (OS7)" #. http://ooc.openstreetmap.org/wms/map.php?source=os7& @@ -27597,126 +28094,109 @@ msgstr "" +#~ msgid "Updating primitive" +#~ msgstr "プリミティブ更新中" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "閉じ括弧があるはずです。" + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません" - -#~ msgid "Download all incomplete ways and nodes in relation" -#~ msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード" +#~ "現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}で" +#~ "す。" + +#~ msgid "User with the same uid but different name found" +#~ msgstr "同じuidで異なる名前のユーザが見つかりました" + +#~ msgid "Use an open changeset" +#~ msgstr "開かれた変更セットを使用" #~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリ" -#~ "ミティブごとにリクエストするには、無効にする。" - -#~ msgid "Images for {0}" -#~ msgstr "{0} のイメージ" - -#~ msgid "Read GPX..." -#~ msgstr "GPXの読み込み…" - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "地点 {0} x {1}に時刻がありません" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。" - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS開始: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS終了: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "現在の差分: {0} 秒" - -#~ msgid "timezone difference: " -#~ msgstr "タイムゾーンの違い: " - -#~ msgid "{0} within the track." -#~ msgstr "トラック内に {0}" - -#~ msgid "Sync clock" -#~ msgstr "時計の同期" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "ファイル \"{0}\"中の日付が取得できません。" - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。" - -#~ msgid "Image" -#~ msgstr "画像" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "GPSユニットのタイムゾーン(写真の時間との違い)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "時刻をGPSユニットと同期する" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "入力した時刻は、解釈できません" - -#~ msgid "" -#~ "WARNING: no API version defined for data to upload. Falling back to " -#~ "version 0.6" -#~ msgstr "" -#~ "警告: アップロードするデータにAPIバージョンが定義されていません。バージョ" -#~ "ン0.6 にフォールバックします。" - -#~ msgid "" -#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to " -#~ "use diff uploads, but API is not able to handle them. Ignoring diff " -#~ "upload." -#~ msgstr "" -#~ "警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アッ" -#~ "プロードの使用が必須ですが、API は取扱えません。差分アップロードを無視しま" -#~ "す。" - -#~ msgid "" -#~ "Loading of {0} plugin was requested. This plugin is no longer required." -#~ msgstr "" -#~ "{0} プラグインのロードが要求されました。このプラグインは今は必須ではありま" -#~ "せん。" - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "ジオタグのある写真" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "AgPifoJで画像を開く..." - -#~ msgid "osmarender options" -#~ msgstr "osmarenderオプション" - -#~ msgid "Group common Address Interpolation inputs in a single dialog," -#~ msgstr "グループ共通のアドレス補間をひとつのダイアログに入力します。" - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれた" -#~ "ジオタグを関連づけします。" - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "あなたの人生をより楽なものにする数種のユーティリティ: 例、ウェイ簡素化、エ" -#~ "リア結合、ポジションへのジャンプ" +#~ "私のGPSレシーバーは写真を撮ることができます。
これは使えますか。" +#~ "" + +#~ msgid "All images" +#~ msgstr "すべての画像" + +#~ msgid "Images with no exif position" +#~ msgstr "exif位置のついていない画像" + +#~ msgid "Not yet tagged images" +#~ msgstr "まだタグ付けされていない画像" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "GPX トラック {2} に、{1}中に{0}枚発見しました。" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPXトラックが読み込まれました" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒" + +#~ msgid "Default Values" +#~ msgstr "デフォルトの値" + +#~ msgid "Enable proxy server" +#~ msgstr "プロキシーサーバを有効" + +#~ msgid "Anonymous" +#~ msgstr "匿名" + +#~ msgid "Proxy server host" +#~ msgstr "プロキシーサーバのホスト名" + +#~ msgid "Proxy server port" +#~ msgstr "プロキシーサーバのポート" + +#~ msgid "Proxy server username" +#~ msgstr "プロキシーのユーザ名" + +#~ msgid "Proxy server password" +#~ msgstr "プロキシーのパスワード" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。" + +#~ msgid "Preparing data..." +#~ msgstr "データを準備中..." + +#~ msgid "Preparing..." +#~ msgstr "準備中..." + +#~ msgid "Uploading..." +#~ msgstr "アップロード中..." + +#~ msgid "Incorrect password or username." +#~ msgstr "正しくないパスワードかユーザ名です。" + +#~ msgid "Enter Password" +#~ msgstr "パスワードを入力して下さい" + +#~ msgid "Login" +#~ msgstr "ログイン" + +#~ msgid "Error: failed to add authentication credentials to the connection." +#~ msgstr "エラー: 接続する認証信任状の追加に失敗。" + +#~ msgid "Auto-tag source added:" +#~ msgstr "自動タグのソースを追加しました。:" + +#~ msgid "Interpolation" +#~ msgstr "補間" + +#~ msgid "Optional" +#~ msgstr "オプション" + +#~ msgid "Shop" +#~ msgstr "自動車パーツショップ" + +#~ msgid "aqueduct" +#~ msgstr "水道" #~ msgid "Move" #~ msgstr "移動" - -#~ msgid "File could not be found." -#~ msgstr "ファイルは存在しませんでした。" #~ msgid "No data imported." @@ -27848,4 +28328,43 @@ #~ msgid "Authors: {0}" #~ msgstr "作者: {0}" + +#~ msgid "Images for {0}" +#~ msgstr "{0} のイメージ" + +#~ msgid "Read GPX..." +#~ msgstr "GPXの読み込み…" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "地点 {0} x {1}に時刻がありません" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。" + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS開始: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS終了: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "現在の差分: {0} 秒" + +#~ msgid "timezone difference: " +#~ msgstr "タイムゾーンの違い: " + +#~ msgid "{0} within the track." +#~ msgstr "トラック内に {0}" + +#~ msgid "Sync clock" +#~ msgstr "時計の同期" + +#~ msgid "Image" +#~ msgstr "画像" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "時刻をGPSユニットと同期する" #~ msgid "Login name (email) to the OSM account." @@ -27943,4 +28462,7 @@ #~ msgstr "Tableau d'Assemblageを選択" +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "AgPifoJで画像を開く..." + #~ msgid "Public" #~ msgstr "公開" @@ -27960,4 +28482,7 @@ #~ msgid "Please select some data" #~ msgstr "データを選択してください" + +#~ msgid "osmarender options" +#~ msgstr "osmarenderオプション" #~ msgid "help" @@ -28032,4 +28557,10 @@ #~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン" #~ "へと戻します。" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "ファイル \"{0}\"中の日付が取得できません。" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "入力した時刻は、解釈できません" #~ msgid "Tagging preset source" @@ -28158,4 +28689,7 @@ #~ "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)" + #~ msgid "Metacarta Map Rectifier image id" #~ msgstr "Metacarta Map Rectifier image id" @@ -28180,4 +28714,7 @@ #~ "した状態で移動させる。選択：クリック。" +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。" + #~ msgid "Occupied By" #~ msgstr "次によって占められる;" @@ -28333,4 +28870,7 @@ #~ msgid "YAHOO (GNOME Fix)" #~ msgstr "米Yahoo (GNOME Fix)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPSユニットのタイムゾーン(写真の時間との違い)" #~ msgid "Image with path {0} does not exist or is not readable." @@ -28364,4 +28904,14 @@ #~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "ジオタグのある写真" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれた" +#~ "ジオタグを関連づけします。" + #~ msgid "" #~ "(You can change the number of days after which this warning appears
by " @@ -28478,4 +29028,11 @@ #~ "このデータセットには id {0} バージョン {1} のプリミティブはありません" +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリ" +#~ "ミティブごとにリクエストするには、無効にする。" + #~ msgid "Primitive already deleted" #~ msgstr "プリミティブは削除済み" @@ -28510,9 +29067,12 @@ #~ msgstr "デフォルトをコピー" +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "{0} プラグインのロードが要求されました。このプラグインは今は必須ではありま" +#~ "せん。" + #~ msgid "Reached the end of the line" #~ msgstr "ラインの終端に到達" - -#~ msgid "Reached a junction" -#~ msgstr "ジャンクションに到達" #~ msgid "Purging 1 primitive" @@ -28570,4 +29130,9 @@ #~ "あなたの言語で作成してください。" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません" + #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "このデータセットには id {0} のプリミティブはありません" @@ -28585,4 +29150,11 @@ #~ "あなたの母国語でそれを作成してください。" +#~ msgid "" +#~ "WARNING: no API version defined for data to upload. Falling back to " +#~ "version 0.6" +#~ msgstr "" +#~ "警告: アップロードするデータにAPIバージョンが定義されていません。バージョ" +#~ "ン0.6 にフォールバックします。" + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。" @@ -28614,4 +29186,13 @@ #~ "''{1}''." #~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" + +#~ msgid "" +#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to " +#~ "use diff uploads, but API is not able to handle them. Ignoring diff " +#~ "upload." +#~ msgstr "" +#~ "警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アッ" +#~ "プロードの使用が必須ですが、API は取扱えません。差分アップロードを無視しま" +#~ "す。" #~ msgid "Preset group ''{0}'' of group ''{1}''" @@ -28680,4 +29261,11 @@ #~ "い。" +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "あなたの人生をより楽なものにする数種のユーティリティ: 例、ウェイ簡素化、エ" +#~ "リア結合、ポジションへのジャンプ" + #~ msgid "{0} via nodes." #~ msgstr "{0} 経由ノード。" @@ -28688,4 +29276,7 @@ #~ msgid "Via node {0}, {1}" #~ msgstr "経由ノード {0}, {1}" + +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "グループ共通のアドレス補間をひとつのダイアログに入力します。" #~ msgid "Replace the way this member refers to with the combined way" @@ -28699,4 +29290,7 @@ #~ msgstr "{0} 極値ノード。" +#~ msgid "Download all incomplete ways and nodes in relation" +#~ msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード" + #~ msgid "No type found. History is empty." #~ msgstr "種別が見つかりません。履歴は空です。" Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 19198) +++ /applications/editors/josm/i18n/po/nb.po (revision 19199) @@ -4,11 +4,12 @@ # FIRST AUTHOR , 2007. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-17 17:59+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-12 00:20+0000\n" +"Last-Translator: Skippern \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:30+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Bygger opp hovedskjermbilde" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hjelp" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Overser feilutformet URL: «{0}»" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Overser feilutformet fil-URL: «{0}»" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Kunne ikke lese fil ''{0}''.
Feilen er:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Kunne ikke lese fil ''{0}''.
Feilen er:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "Om JOSM" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -277,5 +279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -284,5 +286,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -290,16 +292,23 @@ "screen with browser windows
and take some time to finish." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +"Du skal til å åpne {0} nettlesere.
Dette kan både fylle skjermen din med " +"nettlesere
og kan ta tid for å fullføre." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Fortsett" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -308,29 +317,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -347,5 +357,9 @@ msgstr "Avbryt" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Velg minst én allerede opplastet node, linje eller relasjon." @@ -361,5 +375,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Flett" @@ -374,18 +388,18 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" -msgstr "" +msgstr "Ikke noe lag som mål" #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Legg til node …" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Legg til en node ved å skrive inn lengde- og breddegrad." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -401,22 +415,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Rediger: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Angi koordinatene for den nye noden." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Bruk desimalgrader." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative verdier betegner den vestlige/sørlige hemisfæren." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -425,5 +439,5 @@ msgstr "Breddegrad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -432,28 +446,29 @@ msgstr "Lengdegrad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +msgstr "Venligst velg en gyldig breddegrad i området -90..90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +msgstr "Venligst velg en breddegrad i området -90..90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +msgstr "Venligst velg en gyldig lengdegrad i området -180..180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +msgstr "Venligst velg en lengdegrad i området -180..180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -465,9 +480,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -488,18 +503,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -511,5 +526,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -531,6 +546,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -577,5 +592,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" @@ -612,14 +627,15 @@ msgstr "Ingen konflikter å vise." -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +msgstr "Steng åpent endringsset" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +msgstr "Stenger åpent endringsset" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -629,23 +645,23 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Fil: {0}" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -msgid "There are no open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +msgstr "Ingen åpne endringsset" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." -msgstr "" +msgstr "Laster ned åpne endringsset" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 @@ -728,11 +744,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -810,16 +827,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -855,5 +877,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Fordoble" @@ -883,23 +905,23 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Fullskjermvisning" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Slå på og av fullskjermvisning" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 msgid "Toggle Fullscreen view" -msgstr "" +msgstr "Slå på og av Fullskjermvisning" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Eksporter til GPX …" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Eksporter dataene til GPX-fil." @@ -914,12 +936,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -944,8 +966,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -956,10 +978,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -972,17 +994,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1019,22 +1041,27 @@ msgstr "Vis objektinformasjon om OSMs noder, linjer eller relasjoner." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Slå sammen områder med overlapp" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Slår sammen områder med overlapp" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Velg minst én lukket linje å sammenføye med." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Bare to områder kan bli slått sammen foreløpig." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1047,38 +1074,34 @@ "Er du sikker på at du vil fortsette?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Angre hvis du er usikker" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Velg minst én lukket linje å sammenføye med." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "Fant ingen skjæring. Ingen endringer ble gjort." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Noder er lagt til i alle skjæringspunkt" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Slette indre linjer som ikke er del av multipolygon (relasjoner)" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Reparer relasjoner" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Slo sammen områder som overlappet seg selv" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Slo sammen overlappende områder" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1088,33 +1111,33 @@ "oppstått." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Legg inn verdier for alle konflikter." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Reparer konflikter i egenskaper." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Fjernede Element fra Relasjoner" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Slå sammen arealer: fjern korte linjer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Lukket linje" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Fjern egenskaper fra indre linjer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Funksjon Slå sammen Areal" @@ -1277,5 +1300,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kan ikke flytte objekter utenfor kartet." @@ -1353,30 +1376,30 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109 msgid "Download Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +msgstr "Laster ned data" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Vinkle Form" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1385,9 +1408,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1396,16 +1419,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Vinkle (90)" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Bruk" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Vinkle (90)" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1478,18 +1501,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Snu retning på linjer" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Snu retning på alle valgte linjer" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Velg minst én linje" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Snu retning på linjer" @@ -1498,10 +1521,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Lagre" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Lagre gjeldende data." @@ -1558,10 +1581,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Lagre som …" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Lagre aktive data i ny fil." @@ -1603,6 +1626,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1634,5 +1656,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1693,5 +1715,5 @@ "linjen.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1699,5 +1721,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1705,5 +1727,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1737,44 +1759,44 @@ msgstr "Denne noden har ikke knytninger" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Ingen av disse nodene har knytninger." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Ingen noder i denne linjen har andre knytninger." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Valgte element har ikke knytninger som kan løses." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Velg:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* En node med egenskaper, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "– En node som brukes av flere linjer, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "– En node som er brukt av flere linjer, og en av linjene, eller" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"– En linje som har en eller flere noder, som er brukt av flere linjer, eller" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"– En linje som har en eller flere noder, som er brukt av flere linjer, eller" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1787,9 +1809,9 @@ "kopier og alle noder bli valgt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Node uten tilknytning" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1797,5 +1819,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1830,10 +1852,10 @@ msgstr "Tøm utvalg (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Oppdater data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1841,53 +1863,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +msgstr "Last ned data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Oppdatere utvalg" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Oppdater utvalg" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Utvalget er tomt" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Last opp data" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1896,5 +1914,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1902,142 +1920,7 @@ msgstr "Ingen endringer å laste opp." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Ingen endringer å laste opp. Finn frem data først." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synkroniser hele datasettet" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"Upplasting feilet fordi tjeneren har en nyere versjon " -"av en
lokal node, linje eller relasjon.
Konflikten er forårsaket av " -"{0} med ID {1},
tjeneren har versjon " -"{2}, lokal versjon er {3}.

Trykk {4} for å " -"synkronisere kun konfliktelementet.
Trykk {5} for å " -"synkronisere hele det lokale datasettet med tjeneren.
Trykk {6} for å gå tilbake og fortsette å redigere.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Konflikter avdekkeet" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Opplasting feilet fordi tjeneren har en nyere versjon " -"av en node, linje ellerrelasjon.

Trykk {0} for å " -"synkronisere hele det lokale datasettet med tjeneren.
Trykk {1} for å avbryte operasjonen og fortsette å redigere.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "Forbereder konfliktløsing" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Oppdaterer objekt" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2172,9 +2055,9 @@ msgstr "Laster ned GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Laster ned data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2182,5 +2065,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "Ingen data funnet i dette området" @@ -2256,7 +2139,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2273,58 +2156,52 @@ "når linjer slettes. Ctrl: slett objekt med referanse." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Tegn" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Tegn noder" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Modus: Tegne Fokus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "valgt" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Kan ikke legge til node utenfor kartet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Legg til node" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Legg til node i linje" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Knytt eksisterende linje til node" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Legg til en node i eksisterende linje" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Legg til node i linje og lag tilknytning" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Lag ny node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Veg node under pekeren." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2333,14 +2210,14 @@ msgstr[1] "Sett inn ny node i {0} linjer." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Start ny linje fra siste node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Fortsett samme linje fra siste node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Avslutt tegning." @@ -2381,18 +2258,19 @@ "+slipp synkroniserer audio i dette punktet." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Velg" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Velg, flytt og roter objekt" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2401,17 +2279,17 @@ msgstr[1] "Legg til og flytt en kunstig node til {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Flytt elementer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Flytt dem" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Angre flytting" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2421,13 +2299,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Slipp museknappen for å velge objektene i rektangelet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2436,9 +2314,9 @@ "nærmeste node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Slipp museknappen for å avslutte rotasjon." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2451,5 +2329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Forstørr" @@ -2473,5 +2351,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Søk etter objekt." @@ -2561,7 +2439,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:… – alle objekter redigert av angitt bruker" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2570,8 +2447,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:… – objekt med angitt antall noder" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:… – objekt med angitt antall noder" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2579,21 +2466,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified – alle endrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected – alle objekter i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete – alle uferdige objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged – alle objekter uten egenskaper" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2601,5 +2494,5 @@ "child uttrykk – alle underobjekter av objektene i uttrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2607,9 +2500,9 @@ "parent uttrykk – alle overobjekter av objektene i uttrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Bruk | eller OR for søk med logisk eller" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2617,11 +2510,11 @@ "«:»)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Bruk ( og ) for å gruppere uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2629,55 +2522,55 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Start søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Fant ingen treff for «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ingenting lagt til utvalg ved søk etter «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Fant {0} treff" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2690,41 +2583,44 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" "Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Uventet symbol: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "OR mangler argument." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "NOT mangler argument." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Forventer parentes slutt." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "OR mangler argument." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2733,9 +2629,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Feil antall parametere for nodes-operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2746,7 +2642,12 @@ "intervall, for eksempel nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall." @@ -2780,42 +2681,29 @@ msgstr "Feil ved tjenerkommunikasjon." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Gjeldende antall endringer overstiger maksimalt antall endringer: gjeldende " -"er {0}, maksimalt er {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Forhåndsbetingelse brutt" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "API-krav ikke møtt" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"Verdiens lengde for egenskap «{0}» i objekt {1} overstiger maksimalt tillatt " -"lengde {2}. Verdiens lengde er {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Forhåndsbetingelse brutt" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2927,5 +2815,5 @@ msgstr "Sett {0}={1} i {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2940,5 +2828,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -3039,4 +2927,19 @@ msgstr "Løs slettekonflikt i {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3150,5 +3053,5 @@ msgstr "Gjennomføre?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3232,15 +3135,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "Innstillingsfil har feil i linje {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3249,5 +3152,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3256,5 +3159,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3263,5 +3166,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3270,5 +3173,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3276,5 +3179,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3283,5 +3186,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3290,5 +3193,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3297,5 +3200,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3304,10 +3207,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3315,24 +3218,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Innstillinger lagret i {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Kunne ikke laste opp innstillinger. Årsak: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Klarte ikke lese innstillinger fra tjener." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3341,5 +3244,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3368,5 +3271,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3388,31 +3291,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "V" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "Ø" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3420,5 +3316,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3429,27 +3325,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3457,5 +3353,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3467,5 +3363,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3473,25 +3369,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3499,43 +3395,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "parameter «{0}» >= 0 forventet – leste «{1}»" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3543,5 +3451,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3569,10 +3477,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3580,7 +3484,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3595,5 +3499,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3611,146 +3515,138 @@ msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Linje for areal er ikke lukket." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "multipolygon-linje «{0}» er ikke lukket." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Slettet medlem «{0}» i relasjon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Linje «{0}» med færre enn to punkter." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Fant mer enn én linje med «from»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Fant mer enn én linje med «to»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Fant mer enn én \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Ukjent rolle «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Ukjent medlemstype for «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Fant ingen linje med «from»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Fant ingen linje med «to»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Fant ingen node eller linje med «via»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Linje med «from» har ikke start eller slutt i en «via»-node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Linje med «from» har ikke start eller slutt i en «via»-linje." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "linje med «to» har ikke start eller slutt i en «via»-linje." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Fant ikke stil for restriksjon {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Skjæring mellom linjene «{0}» og «{1}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Indre linje «{0}» er utenfor." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Multipolygon-medlem «{0}» er ikke en linje." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Ingen ytre linje for multipolygon «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Stil for indre linje «{0}» er samme som multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Stil for ytre linje «{0}» passer ikke." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "Uten egenskaper" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "tekst" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Feil: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Advarsel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "inaktiv" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "valgt" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3759,6 +3655,6 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3767,7 +3663,8 @@ msgstr[1] "linjer" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3776,21 +3673,37 @@ msgstr[1] "relasjoner" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "Llinje uten egenskaper" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "Linje ikke ferdig" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "bakgrunn" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "fremhevet" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "Uten egenskaper" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "tekst" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3932,5 +3845,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "jernbane" @@ -3946,7 +3859,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3962,4 +3875,10 @@ msgstr[1] "{0} medlemmer" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3991,6 +3910,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Konflikt" @@ -4004,7 +3923,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4089,74 +4008,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Brukernavn" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Passord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "bruk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Vis hjelp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Standard Unix-geometri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Last ned områdeavgrensing" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Last ned området i URL (with lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Åpne fil (som rå gps, dersom .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Last ned områdeavgrensing som rå gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Velg med gitt søkestreng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Start maksimert" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Gå tilbake til standardinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Velg språk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4165,9 +4084,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "eksempler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4177,36 +4096,36 @@ "du prøver --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "I stedet for --download= kan du bruke osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Gjør opplastede programtillegg tilgjengelig" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Laster første programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Setter standardverdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Laster inn programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Innstilligen {0} er fjernet fordi den ikke lenger brukes." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Fil" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4221,22 +4140,22 @@ msgstr "Endre" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Verktøy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Objektmaler" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4244,5 +4163,5 @@ msgstr "Meny: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Audio" @@ -4321,13 +4240,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "Laget er ikke i lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4361,5 +4281,5 @@ msgstr "Klargjør" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4367,6 +4287,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4375,5 +4295,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4382,5 +4302,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4389,25 +4309,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4415,9 +4335,9 @@ msgstr "Rolle" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4449,11 +4369,11 @@ msgstr "rolle {0} deltar ikke i sammenlikningspar {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4462,6 +4382,6 @@ msgstr "Egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4469,6 +4389,6 @@ msgstr "Noder" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4476,23 +4396,23 @@ msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Ingen gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Egenskaper ({0} konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Noder (løst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4501,17 +4421,17 @@ "linjas nodeliste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Noder (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Gjenværende konflikter i denne veiens nodeliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Medlemmer (løst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4521,21 +4441,21 @@ "denne relasjonens medlemsliste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Medlemmer (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "Gjenværende konflikter i denne relasjonens medlemsliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Ingen gjenværende egenskapskonflikter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Egenskaper (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Gjenværende egenskapskonflikter å løse" @@ -4567,22 +4487,22 @@ msgstr "fant ikke {0} i liste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "synkron rulling" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Sammenlikn " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Lokal versjon" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Liste over elementer i det lokale datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4590,5 +4510,5 @@ msgstr "Sammenslått versjon" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4598,18 +4518,18 @@ "sammenslåingsvalgene tas i bruk." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Tjenerversjon" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Liste over elementer i tjenerens datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> topp" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" @@ -4617,9 +4537,9 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> bunn" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" @@ -4627,5 +4547,5 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4635,5 +4555,5 @@ "over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4643,5 +4563,5 @@ "lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4650,5 +4570,5 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" @@ -4656,5 +4576,5 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4664,5 +4584,5 @@ "lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4672,23 +4592,23 @@ "i lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Opp" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Flytt valgte elementer opp én plass" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Ned" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Flytt valgte elementer ned én plass" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4699,27 +4619,27 @@ msgstr "Fjern" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Lås" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Lås" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Lås gjeldende liste over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Lås opp" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Lås opp lista over sammenslåtte elementer og begynn sammenslåing" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4730,5 +4650,5 @@ "tjeneroppføringer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4739,5 +4659,5 @@ "tjeneroppføringer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4746,5 +4666,5 @@ msgstr[1] "Lokal versjon ({0} oppføringer)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4753,5 +4673,5 @@ msgstr[1] "Sammenslått versjon ({0} oppføringer)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4760,5 +4680,5 @@ msgstr[1] "Tjenerens versjon ({0} oppføringer)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4768,5 +4688,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5011,10 +4931,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5024,10 +4944,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5112,9 +5032,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5122,6 +5042,6 @@ msgstr "ingen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "alle" @@ -5210,7 +5130,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5220,6 +5140,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5327,4 +5247,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Slett valgte objekter." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Endre verdier?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Last ned" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Last ned kartdata fra OSM-tjeneren." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Stenger åpent endringsset" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Åpne en editor for den valgte relasjon" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5338,12 +5310,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5361,18 +5333,18 @@ msgstr "Kommandoliste: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Løs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "Åpne en dialog for å sammenføye element i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5380,25 +5352,25 @@ msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Avbryt konfliktløsning og lukk vinduet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Ta i bruk løste konflikter og lukk vinduet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Bruk løsninger" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Fortsett å løse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5410,26 +5382,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5440,41 +5412,41 @@ msgstr "Legg til" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5513,5 +5485,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5526,34 +5498,34 @@ msgstr "Liste over alle innleste lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Slett valgt Lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Vis/Skjul" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Slå av/på visning av Lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Flytt laget en rad opp." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Flytt laget en rad ned." @@ -5563,5 +5535,175 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relasjoner" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Åpne en liste over alle relasjoner" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relasjoner: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Åpne en editor for den valgte relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Slet valgt relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Oprett ny relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Aktuelt utvalg" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Åpne vindu med en utvalgsliste" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Zoom til valgt(e) element" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Zoom til utvalg" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Valgt: Rel.:{0} / Linjer:{1} / Noder:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Utvalg" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Utvalg: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Frigjør panelet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Klikk for at minimere/maksimere panelet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Opphavsmenn" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Åbn en liste af brugere som jobber på de valgte objekt." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Opphavsmann" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# objekter" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "uferdig" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "stengt_vei" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Laster ned åpne endringsset" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5570,22 +5712,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Endre verdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5594,5 +5736,5 @@ msgstr[1] "Endre egenskap på inntil {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5601,226 +5743,71 @@ msgstr[1] "Dette vil endre opptil {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Velg en nøkkel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Velg en verdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Velg de objekter, du vil rette egenskaper for." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Egenskaper/medlemsskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Egenskaper for valgte objekt." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Tilføy egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Egenskaper / Medlemskap" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Skift relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Slett fra relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vil du slette utvalget fra relasjon {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøkkel i alle objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "DSlett egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Rett verdien for den valgte nøkkel for alle objekter" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relasjoner" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Åpne en liste over alle relasjoner" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relasjoner: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Åpne en editor for den valgte relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Slet valgt relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Oprett ny relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Aktuelt utvalg" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Åpne vindu med en utvalgsliste" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Zoom til valgt(e) element" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Zoom til utvalg" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Valgt: Rel.:{0} / Linjer:{1} / Noder:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Utvalg" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Utvalg: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Frigjør panelet" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Klikk for at minimere/maksimere panelet" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Opphavsmenn" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Åbn en liste af brugere som jobber på de valgte objekt." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Opphavsmann" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# objekter" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5882,19 +5869,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Last ned alle ufullstendige linjer og noder i relasjonen" -msgstr[1] "Last ned alle ufullstendige linjer og noder i relasjonen" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Last ned medlemer av relasjon" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Laster ned programtillegg {0} …" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -5912,14 +5898,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Bruk løsninger" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Åpne en editor for den valgte relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5928,14 +5912,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5945,9 +5929,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5957,15 +5941,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5973,5 +5957,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5979,20 +5963,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6001,69 +5985,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" msgstr "Sorter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6072,9 +6056,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6083,49 +6067,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Last ned medlemer av relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Last ned medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "Last ned medlemer av relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6135,34 +6117,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6274,10 +6256,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6287,5 +6269,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6371,9 +6353,4 @@ msgid "Download Area" msgstr "Last ned område" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Last ned" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6673,6 +6650,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6685,6 +6660,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6955,4 +6928,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7175,5 +7152,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7216,116 +7193,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Navn" @@ -7349,15 +7326,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7528,10 +7505,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7539,5 +7516,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7547,9 +7524,9 @@ "historikken." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7666,6 +7643,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "ukjent" @@ -7687,13 +7664,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7728,4 +7705,127 @@ msgstr "Versjon" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synkroniser hele datasettet" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Upplasting feilet fordi tjeneren har en nyere versjon " +"av en
lokal node, linje eller relasjon.
Konflikten er forårsaket av " +"{0} med ID {1},
tjeneren har versjon " +"{2}, lokal versjon er {3}.

Trykk {4} for å " +"synkronisere kun konfliktelementet.
Trykk {5} for å " +"synkronisere hele det lokale datasettet med tjeneren.
Trykk {6} for å gå tilbake og fortsette å redigere.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Konflikter avdekkeet" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Opplasting feilet fordi tjeneren har en nyere versjon " +"av en node, linje ellerrelasjon.

Trykk {0} for å " +"synkronisere hele det lokale datasettet med tjeneren.
Trykk {1} for å avbryte operasjonen og fortsette å redigere.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "Forbereder konfliktløsing" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Gi en kort kommentar for endringene du laster opp:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7744,39 +7844,148 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Last opp endringer" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Lukker endringssett …" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Lagre bruker og passord (ukryptert)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Oppgi brukernavn" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Oppgi egenskaper til sporet" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Advarsel: Passordet overføres ukryptert." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Turn" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Nådde et kryss" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7843,17 +8052,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7866,9 +8075,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7882,9 +8091,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7899,50 +8108,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Forkast og avslutt" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7950,5 +8159,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -8021,40 +8230,375 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Oppdatere object" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "vanskelig" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Indstil tilgængelige programtillegg" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Ukjent rolle «{0}»." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Last opp endringer" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Om" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Velg raden som skal slettes" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Objekter som legges til:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Objekter som endres:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Objekter som slettes:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8063,5 +8607,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8070,5 +8614,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8077,208 +8621,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Last opp endringer" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Tast inn først de ønskede koordinater." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Gi en kort kommentar for endringene du laster opp:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} meter" -msgstr[1] "{0} meter" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Oppgi brukernavn" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps-punkt" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Tilpass linjetegning" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Bruk globale indstillinger." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Tegn linjer mellem punkter i dette laget." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Tegn ikke linjer mellem punkt i dette laget." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Velg linjetegnings-innstillinger" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8286,5 +8659,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8293,5 +8666,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8373,5 +8746,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Beskrivelse" @@ -8403,10 +8776,10 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Konverter til datalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8416,12 +8789,12 @@ "skadeligt
Se her for å laste inn GPS spor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8430,29 +8803,29 @@ msgstr "Konvertert fra: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Last ned fra OSM langs dette spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Last ned alt innenfor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Max areal per forespørsel:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8463,9 +8836,9 @@ "Ønsker du
å fortsette?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8475,5 +8848,5 @@ "ble utelatt eller flyttet til start." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8483,23 +8856,23 @@ "utelatt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "utenfor nedlastet område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "versjon {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8508,5 +8881,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8520,5 +8893,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8531,11 +8904,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8544,36 +8917,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "ikke satt" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "API versjon: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8581,5 +8954,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8588,5 +8961,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8594,5 +8967,5 @@ msgstr[1] "punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8601,5 +8974,5 @@ msgstr[1] "et GPS spor med {0} punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8608,5 +8981,5 @@ msgstr[1] "{0} består av {1} GPS spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8615,24 +8988,24 @@ msgstr[1] "{0} punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX Filer (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Fila {0} er lastet inn under navnet «{1}»" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Feil oppsto ved sending av {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Klarte ikke lese «{0}»" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8643,34 +9016,34 @@ "
Skriv inn tidspunktet og velg tidssone

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Tidspunkt for foto (fra EXIF):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Gps tidspunkt (lest i bildet ovenfor): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Jeg er i tidssonen: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Ingen dato" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Åpne et annet foto" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synkroniser tiden fra et bilde på GPS-mottakeren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8680,70 +9053,158 @@ "Sjekk format" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Ugyldig dato" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX-spor: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Åpne flere GPX-spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Automatisk forslag" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Opdater posisjon for: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Tidssone: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Forskyvning:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Jeg kan fotogragere min GPS mottaker.
Kan det være til hjelp?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Opdater posisjon for: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alle bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Bilder uden EXIF-posisjon" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Bilder uten egenskaper" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Intet er valgt!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Koplet {0} av {1} foto til GPX spor." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Jevnfør bilder med GPX spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Jevnfør" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Automatisk forslag" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Ugyldig tidssone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Ugyldig forskyvning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Tegne" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Tidssone: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Minutter: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekunder: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Tidsforskjell på {0} dager)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" +"Klarte ikke synkronisere bildene med GPX-sporet. Bruk glidebryterne for å " +"synkronisere bildene manuelt." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "Klarte ikke å koble foto til sporet" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Juster tidssone og forskyvning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "Valgte foto har ikke tidskode." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Foto har ikke tidskode." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX sporet har ikke tidskoder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "Du bør velge et GPX-spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "Intgen GPX-spor er valgt" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8754,9 +9215,5 @@ "Forventet format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Ugyldig tidssone" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8767,136 +9224,56 @@ "Forventet format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Ugyldig forskyvning" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Fant {0} treff av {1} i GPX spor {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX-spor er lagt inn" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Valgte foto har ikke tidskode." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Foto har ikke tidskode." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX sporet har ikke tidskoder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Tidssone: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minutter: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekunder: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Koplet {0} av {1} foto til GPX spor." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Tidsforskjell på {0} dager)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Forskyvning mellom spor og foto: {0}m {1}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" -"Klarte ikke synkronisere bildene med GPX-sporet. Bruk glidebryterne for å " -"synkronisere bildene manuelt." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Klarte ikke å koble foto til sporet" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Juster tidssone og forskyvning" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standardverdier" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Leser GPS posisjoner fra EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Starter scanning av mapper" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Les bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Leser {0} …" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Klarte ikke å lage fullstendig sti til mappa {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Scanner mappa {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Fant tom fil i mappa {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Feil ved lesing av fil i mappa {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Geotaggede bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Juster til GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8904,52 +9281,99 @@ msgstr[1] "bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} hadde gps posisjon." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Filen finnes ikke." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Ingen bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Laster {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Feil i fil {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Vis geotaggede bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Forrige" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Forrige bilde" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Nettside: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Fjern foto fra lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Slett fra relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Neste" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Neste bilde" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Midtstill kartbilde" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Zoom beste utsnitt 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8960,5 +9384,5 @@ "Høyde: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9059,4 +9483,12 @@ msgid "Error displaying URL" msgstr "Feil ved visning av URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9283,7 +9715,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Alle" @@ -9352,6 +9783,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Sykkel" @@ -9747,31 +10178,95 @@ msgstr "Klarte ikke bruke projeksjonen {0}. Bruker Mercators projeksjon." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Bruk proxy-tjener" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonym" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Ungdomsherberge" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Port:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Passord" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Proxy Innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Proxy-tjenerens vert" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Proxy-tjenerens port" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Brukernavn for proxy-tjener" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Passord for proxy-tjener" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "URL-adressen for OSM-tjeneren (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "E-postadresse for OSM-kontoen" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Innloggings passord til OSM kontoen. La feltet være tomt for ikke å lagre " +"noen passord." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "URL-adresse til tjener" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "OSM-brukernavn (e-post)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM passord" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"Advarsel: Passordet lagres i ren tekst i innstillingsfila." +"
Passordet overføres i ren tekst til tjeneren som del av URL-adressen." +"
Ikke bruk et verdifullt passord." #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10071,5 +10566,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10079,13 +10574,13 @@ msgstr[1] "Fjern gamle egenskapsnøkler fra {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10093,18 +10588,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Valgfrie attributter:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "stengt_vei" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Ukjent type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10115,16 +10610,16 @@ msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Feil ved lesing av {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Element type {0} kan brukes." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10133,18 +10628,18 @@ msgstr[1] "Endre {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Utvalget passer ikke formålet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Bruk Objektmal" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Endre egenskaper" @@ -10173,4 +10668,14 @@ msgstr "Laster ned punkt {0} til {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +#, fuzzy +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" +"ugyldig verdi for obligatorisk attributt «{0}» av type «OsmPrimitiveType» – " +"leste «{1}»" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10186,12 +10691,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, muligens fordi egenskaper mangler." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Klargjør data …" +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, fuzzy, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "Uventet kolonnenummer {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10294,10 +10854,10 @@ msgstr "Lesefeil: Strukturen i GPX fila er ukjent" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -10305,6 +10865,6 @@ "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10314,40 +10874,40 @@ msgstr "Laster ned OSM-data …" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Tjeneren svarte med HTTP 404 for ID {0} – hopper over." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10357,10 +10917,10 @@ "element." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Laster ned punkt {0} til {1}..." -msgstr[1] "Laster ned punkt {0} til {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10397,33 +10957,32 @@ msgstr "Feil ved import av NMEA data!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, fuzzy, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." msgstr "Innstilling «{0}» mangler. Kan ikke starte OSM-API." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "Denne versjonen av JOSM kan ikke lese fra tjeneren." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"Den støtter protokollversjon 0.5 og 0.6, mens tjeneren støtter {0} til {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Kommunikasjon er opprettet med {0} med protocol versjon {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "Uventet ID-format i svar fra tjener – leste «{0}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10431,66 +10990,77 @@ msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Lukker endringssett …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Ingen base med rettinger tilstede for opplasting" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Forbereder …" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Laster opp …" - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Klargjør data …" + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Endre {0} objekt" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10517,4 +11087,14 @@ msgid "Invalid bz2 file." msgstr "Ugyldig bzip2-fil" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10525,5 +11105,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10550,5 +11130,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10556,5 +11136,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10567,5 +11147,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10576,62 +11156,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Feil passord eller brukernavn." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Advarsel: Passordet overføres ukryptert." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Lagre bruker og passord (ukryptert)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Skriv inn passord" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Logg inn" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "URL-adressen for OSM-tjeneren (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "E-postadresse for OSM-kontoen" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Innloggings passord til OSM kontoen. La feltet være tomt for ikke å lagre " -"noen passord." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "URL-adresse til tjener" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "OSM-brukernavn (e-post)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM passord" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"Advarsel: Passordet lagres i ren tekst i innstillingsfila." -"
Passordet overføres i ren tekst til tjeneren som del av URL-adressen." -"
Ikke bruk et verdifullt passord." - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10727,5 +11251,12 @@ msgstr "Fila «{0}» finnes ikke" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10734,38 +11265,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10773,19 +11304,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Ufullstendig -spesifikasjon med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Ulovlig objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10795,8 +11326,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10806,25 +11337,43 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" +"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" +"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10832,5 +11381,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10839,5 +11388,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10845,5 +11394,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10852,13 +11401,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Klargjør OSM-data …" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10881,21 +11430,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Laster ned åpne endringsset" +msgstr[1] "Laster ned åpne endringsset" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Laster ned åpne endringsset" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10914,7 +11475,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "Uventet verdi for parameter «index». Leste {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10923,9 +11484,5 @@ msgstr "Klarte ikke åpne tilkobling til API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10977,7 +11534,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "Uventet verdi for parameter «index». Leste {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 @@ -10985,5 +11542,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10993,4 +11550,9 @@ msgid "Uploading data ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Slettede eller flyttede objekter" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11032,12 +11594,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Slett {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Feil ved sletting av programtillegg: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11179,9 +11741,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "ingen beskrivelse tilgjengelig" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Flere detaljer" @@ -11313,4 +11875,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "Uventet verdi for parameter «index». Leste {0}." + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Parameter «{0}» > 0 forventet – leste «{1}»." + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11604,6 +12181,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Last opp sporlogger" @@ -11689,5 +12266,5 @@ msgstr "GPX Spor lastes opp" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Last opp spor til openstreetmap.org" @@ -11698,5 +12275,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Interpoler adresser" @@ -11711,11 +12288,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Oddetall" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Heltall" @@ -11726,24 +12300,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Nummer" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "natur" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "bilde" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Bilutleie" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11761,7 +12331,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "indre linjesegment" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11874,5 +12443,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11934,21 +12503,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Velg kommune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Velg fra …" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Matrikkel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11961,13 +12530,13 @@ "Vil du gjenopprette bruken av F11 til å laste ned bilder?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "Gjenopprett F11-hurtigtast" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM avsluttes for at endringen skal tre i kraft." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11992,17 +12561,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Aktiviser automatisk mellomlager." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Max. lager størrelse (i MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12019,9 +12588,9 @@ "
før du laster inn data med dette programtillegget." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "Fransk cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -12029,10 +12598,10 @@ "html>" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Kilde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12041,5 +12610,5 @@ "Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12049,53 +12618,50 @@ "tekst på mørk bakgrunn." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Tillat stabling av flere lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Sett transperens på WMS lag. Høyre: opak, venstre: transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Trekk et rektangel rundt data lastet ned fra WMS-tjener." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hent mindre bilder (høyere kvalitet men minnekrevende)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Fast kvadrat størrelse (standard er 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fast størrelse (fra 25 til 1000 meter)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "De eldste filene blir automatisk slettet når denne størrelsen overskrides" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Automatisk egenskap: kilde er lagt inn:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Legg inn kilde ( source=...) på element?" @@ -12299,5 +12865,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Område" @@ -12495,5 +13061,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Ingen data lastet inn." @@ -12515,9 +13081,9 @@ msgstr "Konverter til GPX lag med anonymisert tid" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "Rediger GPX-spor" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "Rediger GPX" @@ -12906,7 +13472,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "vann" @@ -13065,19 +13631,19 @@ msgstr "Kunne ikke hente bilde" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Kobler opp" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Tilkoblet" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Ikke Tilkoblet" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Tilkobling mislykkes" @@ -13116,32 +13682,32 @@ msgstr "LiveGPS-lag" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Lagre GPS spor" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "Koble til gpsd-tjener og vis nåværende posisjon i LiveGPS-lag" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Sentrer GPS nå" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Sentrer LiveGPS-laget til nåværende position." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Auto-sentrer" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Sentrer LiveGPS-laget løpende til den nåværende posisjon." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13192,9 +13758,9 @@ msgstr "Kan ikke tegne utenfor verden." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "målemetode" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Mål" @@ -13232,5 +13798,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13241,13 +13807,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13398,5 +13964,5 @@ msgstr "Firefox-programfil" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13491,5 +14057,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13565,41 +14131,41 @@ msgstr "Gi verdier for vekting" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Last Kartbilde" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Hent alle kartbilder" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Zoom inn" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Zoom ut" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "Tøm bildehurtiglager" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "bilde " @@ -13772,4 +14338,43 @@ msgstr "Du må først oppgi kilde for objektmaler." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Heltall" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Laveste nummer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Høyseste nummer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Veier" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Høyseste nummer" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13788,42 +14393,20 @@ msgstr "Reverser Terasseinndeling" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Terasseinndeling av hus (og rekkehus)" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Del opp lang bygning i separate hus." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Velg én enkel lukket linje med minst fire noder." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Terasse" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Høyseste nummer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Laveste nummer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolasjon" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Gatenavn" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Tillegg" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13838,5 +14421,5 @@ msgstr "Ingen valideringsfeil" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Rutenett" @@ -14493,38 +15076,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "bygning" @@ -14538,5 +15091,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "område" @@ -14651,10 +15204,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15387,6 +15940,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Veinummer" @@ -15832,5 +16385,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Bredde ( meter)" @@ -15948,5 +16501,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15958,5 +16511,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "skogsområde" @@ -16214,4 +16767,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16243,8 +16799,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "ja" @@ -16392,9 +16950,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "nei" @@ -16639,5 +17198,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "boligvei" @@ -16672,5 +17231,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "adkomstvei" @@ -16704,6 +17263,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "veiarbeid" @@ -16753,5 +17312,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "rundkjøring" @@ -16939,6 +17498,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Tursti" @@ -17059,5 +17618,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17083,4 +17641,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17090,15 +17649,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operatør" @@ -17310,7 +17869,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Høyde" @@ -17729,5 +18288,5 @@ msgstr "Flytemyr" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17737,5 +18296,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "Myrområde" @@ -18261,32 +18820,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Åpningstider" @@ -18345,91 +18904,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18444,5 +19003,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18461,7 +19020,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Referansenummer" @@ -18477,5 +19036,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "P-kjeller" @@ -18488,6 +19047,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Gebyr" @@ -18526,22 +19085,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Butikk" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Rediger bilforretning" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Verksted" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Rediger verksted" @@ -18549,5 +19096,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Bilutleie" @@ -18556,10 +19103,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Rediger bilutleie" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Bildeling" @@ -18567,5 +19114,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Rediger bildeling" @@ -18573,10 +19120,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Rediger sykkelparkering" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Kapasitet" @@ -18585,22 +19132,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Rediger sykkelutleie" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Rediger sykkelbutikk" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Offentlig transport" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18610,5 +19150,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18616,5 +19156,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "Internasjonal UIC-jernbanekode" @@ -18622,5 +19162,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Jernbanestopp" @@ -18628,5 +19168,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Rediger jernbanestopp" @@ -18634,5 +19174,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Trikkestopp" @@ -18641,5 +19181,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Rediger trikkestopp" @@ -18647,5 +19187,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Jernbaneplattform" @@ -18654,5 +19194,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Rediger jernbaneplattform" @@ -18664,5 +19204,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Spornummer" @@ -18670,10 +19210,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Område" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "T-baneinngang" @@ -18682,10 +19222,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Rediger T-baneinngang" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Rullestol" @@ -18694,5 +19234,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Busstasjon" @@ -18701,5 +19241,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Rediger busstasjon" @@ -18707,5 +19247,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Bussholdeplass" @@ -18715,5 +19255,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Rediger bussholdeplass" @@ -18722,17 +19262,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Leskur / Ly for natten" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Benk" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Bussplatform" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Rediger bussplattform" @@ -18740,5 +19288,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -18746,5 +19294,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Rediger taxi-stasjon" @@ -18752,5 +19300,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Flyplass" @@ -18758,15 +19306,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Rediger flyplass" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18774,10 +19322,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Overnatting" @@ -18789,5 +19337,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotell" @@ -18796,15 +19344,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Rediger hotell" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Stjerner" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motell" @@ -18812,20 +19360,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Rediger motell" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Gjestehus" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Rediger gjestehus" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Feriehytter" @@ -18833,10 +19381,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Rediger feriehytter" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Ungdomsherberge" @@ -18844,30 +19392,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Rediger ungdomsherberge" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Fjellstue" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Rediger fjellstue" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Campingvognplass" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Rediger campingvognplass" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Campingplass" @@ -18875,10 +19423,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Rediger campingplass" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Mat og drikke" @@ -18889,5 +19437,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -18895,5 +19443,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Rediger restaurant" @@ -18901,5 +19449,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Kjøkken" @@ -18907,61 +19455,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italiensk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "kinesisk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "gatekjøkken" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "gresk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "tysk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indisk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "lokal" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "tyrkisk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asiatisk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thai" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "meksikansk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japansk" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Gatekjøkken" @@ -18969,9 +19517,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Rediger gatekjøkken" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Kafé" @@ -18979,9 +19527,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Rediger kafé" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pub" @@ -18989,18 +19537,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Rediger pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Rediger Biergarten" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Bar" @@ -19008,9 +19556,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Rediger bar" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Nattklubb" @@ -19018,24 +19566,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Rediger nattklubb" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turisme" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Attraksjon" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Rediger attraksjon" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museum" @@ -19043,9 +19591,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Rediger museum" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoologisk hage" @@ -19054,9 +19602,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Rediger zoologisk hage" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Utsiktspunkt" @@ -19064,24 +19612,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Rediger utsiktspunkt" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Utsiktstårn" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Temapark" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Rediger temapark" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Kunstverk" @@ -19089,5 +19637,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Rediger kunstverk" @@ -19095,19 +19643,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Turistinformasjon" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Kart" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -19145,5 +19693,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19151,28 +19699,28 @@ msgstr "gate" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Nærmere forklaring" @@ -19182,5 +19730,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -19188,6 +19736,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Sykling" @@ -19195,5 +19743,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19201,6 +19749,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Ski" @@ -19208,5 +19756,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19214,46 +19762,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Informasjonstavle" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "historisk" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "natur" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "dyreliv" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19261,29 +19809,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. -#: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 msgid "Phone number" msgstr "" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Annen informasjon" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Rediger ly for natten" @@ -19291,25 +19839,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Bålplass" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Piknik-sted" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Rediger piknik-sted" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Historiske steder" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Slott" @@ -19318,19 +19866,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Rediger slott" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruiner" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Rediger ruiner" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Arkeologisk plass" @@ -19339,9 +19887,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Rediger arkeologisk plass" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Slagmark" @@ -19349,10 +19897,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Rediger slagmark" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19360,5 +19908,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19366,15 +19914,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monument" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Rediger monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Minneplatte" @@ -19382,55 +19930,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Rediger minneplatte" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Kors i veikant" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Rediger kors i veikant" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Veialter" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Rediger veialter" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Fritid" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Badepark" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Rediger badepark" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Lekeplass" @@ -19438,35 +19986,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Rediger lekeplass" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Fiskeplass" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Rediger fiskeplass" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Sport" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Sport" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Rediger stadion" @@ -19480,6 +20028,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "velg sport:" @@ -19871,30 +20419,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "sport" @@ -19904,225 +20452,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "flerbruk" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "bueskyting" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "turn" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "australsk fotball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basketball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "boules" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "bowls" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "kano" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "klatring" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "cricketnett" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "krocket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "sykling" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "hundeløp" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "ridning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gymnastikk" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "ishockey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "hesteløp" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "motorsport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "racquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "skyting" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "skøyter" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "ski" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "fotball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "svømming" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "bordtennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Sportssenter" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Rediger sportssenter" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Bane" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Rediger bane" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Racerbane" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Rediger racerbane" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfbane" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Rediger golfbane" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Rediger minigolf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Flerbruk" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Rediger flerbruk" @@ -20161,21 +20709,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "type" @@ -20214,203 +20762,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "bane" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "sportssenter" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "bowling" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Rediger bowling" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Turn" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Rediger turn" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Bueskyting" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Rediger bueskyting" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Klatring" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Rediger klatring" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Kano" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Rediger kano" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Rediger sykling" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Hundeløp" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Rediger hundeløp" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Ridning" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Rediger ridning" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Hesteløp" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Rediger hesteløp" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gymnastikk" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Rediger gymnastikk" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Motorsport" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Rediger motorsport" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Skøyter" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Rediger skøyter" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Rediger skateboard" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Svømming" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Rediger svømming" @@ -20418,56 +20966,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Rediger ski" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Løypetype" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "slalom" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "langrenn" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "snøpark" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Vanskelighetsgrad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "begynner" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "enkel" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "middels" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "vanskelig" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "ekspert" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "fristil" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Skyting" @@ -20475,182 +21023,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Rediger skyting" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Ballsport" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Fotball" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Rediger fotball" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Amerikansk fotball" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Rediger amerikansk fotball" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Australsk fotball" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Rediger australsk fotball" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Rediger baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Rediger basketball" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Rediger golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golfbane" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Rediger boule" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Bowls" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Rediger bowls" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Rediger cricket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Cricketnett" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Rediger cricketnett" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Krocket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Rediger krocket" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Ishockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Rediger ishockey" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Rediger pelota" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Racquet" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Rediger racquet" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Rediger rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Bordtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Rediger bordtennis" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Rediger tennis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Bygninger" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Bygning" @@ -20658,5 +21206,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Offentlig bygning" @@ -20664,10 +21212,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Rediger offentlig bygning" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Rådhus" @@ -20675,10 +21223,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Rediger rådhus" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Ambassade" @@ -20686,10 +21234,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Rediger ambassade" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Domstol" @@ -20698,10 +21246,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Rediger domstol" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Fengsel" @@ -20710,10 +21258,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Rediger fengsel" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Politi" @@ -20723,10 +21271,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Rediger politi" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Brannstasjon" @@ -20735,10 +21283,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Rediger brannstasjon" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Postkontor" @@ -20746,5 +21294,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Rediger postkontor" @@ -20752,15 +21300,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Barnehage" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Rediger barnehage" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Skole" @@ -20768,10 +21316,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Rediger skole" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Universitet" @@ -20779,10 +21327,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Rediger universitet" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Høyskole" @@ -20790,5 +21338,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Rediger høyskole" @@ -20796,5 +21344,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Kino" @@ -20803,10 +21351,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Rediger kino" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Bibliotek" @@ -20815,9 +21363,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Rediger bibliotek" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Kunstsenter" @@ -20825,10 +21373,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Rediger kunstsenter" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Teater" @@ -20837,10 +21385,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Rediger teater" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Tilbedelsessted" @@ -20850,5 +21398,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Rediger tilbedelsessted" @@ -20857,6 +21405,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religion" @@ -20865,66 +21413,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "kristen" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "jødisk" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "unitarisk" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrisk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Trosretniing" @@ -20933,81 +21481,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglikansk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "katolsk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangelisk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "Jehovas vitner" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "luthersk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "metodist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormoner" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "ortodoks" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pinsebevegelsen" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbyteriansk" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adresser" @@ -21016,5 +21564,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Rediger adresseinformasjon" @@ -21022,5 +21570,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Husnummer" @@ -21028,20 +21576,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Husnavn" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Gatenavn" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "By/sted" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Postnummer" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Landskode" @@ -21050,5 +21603,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Rediger interpolasjon" @@ -21056,61 +21609,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Nummereringsmåte" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "oddetall" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "partall" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "alfabetisk" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Menneskeskapt" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Fabrikk" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Rediger fabrikk" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Tårn" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Rediger tårn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -21118,25 +21671,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Vanntårn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Rediger vanntårn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gassbeholder" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Rediger gassbeholder" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Fyrtårn" @@ -21144,10 +21697,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Rediger fyrtårn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Vindmølle" @@ -21155,10 +21708,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Rediger vindmølle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Rørledning" @@ -21167,37 +21720,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Rediger rørledning" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gass" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Kloakkrenseanlegg" @@ -21207,10 +21760,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Rediger kloakkrenseanlegg" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Kran" @@ -21218,10 +21771,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Rediger kran" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Fyrlykt" @@ -21229,10 +21782,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Rediger fyrlykt" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Trigonometrisk punkt" @@ -21240,10 +21793,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Rediger trigonometrisk punkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Overvåkingskamera" @@ -21251,5 +21804,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Rediger overvåkingskamera" @@ -21257,5 +21810,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Kraftverk" @@ -21265,35 +21818,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Rediger kraftverk" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "vind" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "vann" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "atom" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "kull" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "solcelle" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Kraftstasjon" @@ -21302,10 +21855,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Rediger kraftstasjon" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Transformatorstasjon" @@ -21314,5 +21867,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Rediger transformatorstasjon" @@ -21320,10 +21873,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Linjenummer" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Kraftmast" @@ -21334,23 +21887,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Rediger kraftmast" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Kraftlinje" @@ -21359,75 +21912,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Rediger kraftlinje" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Spenning" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Fasiliteter" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Toaletter" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Kommentar" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Postkasse" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefon" @@ -21436,5 +21989,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Rediger telefon" @@ -21442,5 +21995,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Mynter" @@ -21448,5 +22001,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Sedler" @@ -21454,5 +22007,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Elektronisk lommebok eller betalingskort" @@ -21460,5 +22013,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Bankkort" @@ -21466,15 +22019,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kredittkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Returstasjon" @@ -21483,5 +22036,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Rediger returstasjon" @@ -21489,68 +22042,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Bokser" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Klær" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Glass" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papir" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Metall" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Benk" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21621,39 +22169,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "grønn" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Jaktpost" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Rediger jaktpost" @@ -21662,30 +22210,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Høyde" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "lav" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "halv" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "full" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Skjul" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fontene" @@ -21694,10 +22242,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Rediger fontene" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Drikkevann" @@ -21706,10 +22254,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Rediger drikkevann" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Stellebord" @@ -21717,33 +22265,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Rediger stellebord" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Rediger bilforretning" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Rediger sykkelbutikk" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarked" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Rediger supermarked" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Minimarked" @@ -21751,9 +22323,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Rediger Minimarked" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosk" @@ -21761,27 +22333,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Rediger kiosk" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Automat" @@ -21789,5 +22361,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Rediger automat" @@ -21795,88 +22367,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Automatprodukter" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "billetter" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "buss-, trikk- og togkart" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "parkeringsbillett" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "mat" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "drikke" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "godter" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "sigaretter" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "foto" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "dyremat" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "leker" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "frimerke" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "telefonkort" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "sedler" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "hundeposer" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "kundekort" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Slakter" @@ -21884,9 +22456,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Rediger slakter" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Baker" @@ -21894,9 +22466,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Rediger baker" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Blomster" @@ -21904,18 +22476,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Rediger blomster" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Økologisk" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Rediger økologisk" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Sprit og vin" @@ -21923,54 +22495,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Rediger sprit og vin" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Drikke" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Rediger drikke" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Dataelektronikk" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Rediger dataelektronikk" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Elektronikk" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Rediger elektronikk" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Rediger hifi" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Møbler" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Rediger møbler" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Hagesenter" @@ -21978,9 +22550,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Rediger hagesenter" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Jernvarehandel" @@ -21988,9 +22560,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Rediger jernvarehandel" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Byggevare" @@ -21998,54 +22570,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Rediger byggevare" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Kontor" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Rediger kontor" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Frisør" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Rediger frisør" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Sko" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Rediger sko" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Leker" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Rediger leker" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Rediger video" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Renseri" @@ -22053,9 +22625,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Rediger renseri" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Vaskeri" @@ -22063,9 +22635,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Rediger vaskeri" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Friluftsutstyr" @@ -22073,28 +22645,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Rediger friluftsutstyr" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Rediger sport" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Optiker" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Rediger optiker" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Valuta" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Bank" @@ -22102,14 +22674,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Rediger bank" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Minibank" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Veksle valuta" @@ -22117,5 +22689,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Rediger valutaveksling" @@ -22123,15 +22695,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Rediger minibank" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Helse" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Lege" @@ -22139,18 +22711,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Rediger lege" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Tannlege" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Rediger tannlege" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Apotek" @@ -22158,5 +22730,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Rediger apotek" @@ -22164,9 +22736,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Reseptlevering" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Sykehus" @@ -22174,10 +22746,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Rediger sykehus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Redningsmøtepunkt" @@ -22186,5 +22758,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Rediger redningsmøtepunkt" @@ -22193,20 +22765,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Navn på punkt" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)" @@ -22214,5 +22786,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Veterinær" @@ -22221,64 +22793,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Rediger veterinær" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Steder" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Rediger kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Rediger land" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Delstat/provins" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Rediger delstat/provins" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Rediger region (fylke)" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Kommune" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Rediger kommune" @@ -22286,15 +22858,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Storby" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Rediger storby" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "By" @@ -22302,10 +22874,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Rediger by" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Forstad/bydel" @@ -22313,25 +22885,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Rediger forstad/bydel" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Landsby" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Rediger landsby" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Grend" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Rediger grend" @@ -22339,5 +22911,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Lokalitet" @@ -22345,10 +22917,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Rediger lokalitet" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Øy" @@ -22356,10 +22928,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Rediger øy" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22367,5 +22939,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22373,5 +22945,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Huleinngang" @@ -22379,10 +22951,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Rediger huleinngang" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Fjelltopp" @@ -22390,10 +22962,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Rediger fjelltopp" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Isbre" @@ -22401,10 +22973,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Rediger isbre" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Vulkan" @@ -22412,70 +22984,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Rediger vulkan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Grenser" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Nasjonal" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Rediger landegrense" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Fylkesgrense" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Rediger fylkesgrense" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Kommunegrense" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Rediger kommunegrense" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Politisk" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Rediger politisk grense" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Nasjonalpark" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Rediger nasjonalparkgrense" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Bruk av grunn" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Tre" @@ -22484,15 +23056,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Rediger tre" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Skogsområde" @@ -22501,5 +23073,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Rediger skogsområde" @@ -22507,17 +23079,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "barskog" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "løvskog" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "blandingsskog" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Skog" @@ -22526,14 +23098,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Rediger skog" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Naturreservat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Rediger naturreservat" @@ -22541,25 +23113,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Steinur" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Rediger steinur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Krattskog" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Rediger krattskog" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Fjell" @@ -22567,10 +23139,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Rediger fjell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Beite" @@ -22578,5 +23150,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Rediger beite" @@ -22584,5 +23156,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Gårdstun" @@ -22591,45 +23163,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Rediger gårdstun" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Åkerland" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Rediger åkerland" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Eng" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Rediger eng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vingård" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Rediger vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Hageparseller" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Rediger hageparseller" @@ -22637,25 +23209,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Hage" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Rediger hage" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Gress" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Rediger gress" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Friområde" @@ -22663,10 +23235,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Rediger friområde" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Offentlig" @@ -22674,20 +23246,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Rediger offentlig" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Rediger park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Friluftsområde" @@ -22695,5 +23267,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Rediger friluftsområde" @@ -22701,15 +23273,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Boligområde" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Rediger boligområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Gravlund" @@ -22717,9 +23289,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Rediger gravlund" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Kirkegård" @@ -22727,39 +23299,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Rediger kirkegård" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Forretninger" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Rediger forretninger" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Næringsområde" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Rediger næringsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Industriområde" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Rediger industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Jernbanegrunn" @@ -22767,15 +23339,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Rediger jernbanegrunn" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Millitært" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Rediger millitært" @@ -22783,55 +23355,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Byggeplass" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Rediger byggeplass" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Rivningsområde" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Rediger rivningsområde" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Byggeområde" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Rediger byggeområde" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Avfallsdeponi" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Rediger avfallsdeponi" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Steinbrudd" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Rediger steinbrudd" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multipolygon" @@ -22841,5 +23413,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Rediger multipolygon" @@ -22848,10 +23420,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "ytre linjesegment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "indre linjesegment" @@ -22859,5 +23431,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Svingeforbud" @@ -22866,5 +23438,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Rediger svingeforbud" @@ -22872,34 +23444,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Forbud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "venstresving forbudt" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "høyresving forbudt" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "rett frem forbudt" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "u-sving forbudt" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "påbudt høyresving" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "påbudt venstresving" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "påbudt rett frem" @@ -22908,15 +23480,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "fra linje" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "via node eller linje" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "til linje" @@ -22924,5 +23496,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Rute" @@ -22931,5 +23503,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Rediger rute" @@ -22937,5 +23509,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Rutetype" @@ -23007,24 +23579,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "sykkel" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "vei" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "ferge" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "ski" @@ -23077,5 +23649,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23084,13 +23656,13 @@ msgstr "fotgjenger" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "tur" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "trikk" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "omkjøring" @@ -23104,10 +23676,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "T-bane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Symbolforklaring" @@ -23115,31 +23687,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Nettverk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "planlagt" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "midlertidig" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Farge (hex)" @@ -23148,30 +23720,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "rutesegment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "neste segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "forrige segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "stoppepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "neste stoppunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "forrige stoppunkt" @@ -23382,130 +23954,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23522,98 +23968,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "uønsket" @@ -23990,7 +24345,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "ferdselsvei – traktorvei" @@ -24054,13 +24409,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "jernbane" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24076,5 +24510,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "service" @@ -24088,5 +24522,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "vadested" @@ -24107,5 +24541,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "vendesirkel" @@ -24120,5 +24554,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "redningsmøtepunkt" @@ -24133,5 +24567,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "elvebredd" @@ -24145,5 +24579,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "bekk" @@ -24157,5 +24591,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "tørrdokk" @@ -24177,16 +24611,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "akvadukt" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24283,4 +24705,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24349,13 +24778,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "menneskeskapt" @@ -24401,6 +24830,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24417,7 +24846,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "jernbanepunkt" @@ -24440,10 +24869,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "annen bane" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "jernbanebro" @@ -24479,11 +24908,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "nedlagt bane" #. color rail +#. #. 1 #. 50000 @@ -24524,6 +24954,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "aeroway" @@ -24537,5 +24967,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "stasjon" @@ -24557,5 +24987,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "aeroway_dark" @@ -24569,5 +24999,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "aeroway_light" @@ -24575,4 +25005,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24622,7 +25059,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "aerialway" @@ -24639,5 +25076,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "nedfart enkel" @@ -24652,5 +25089,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "nedfart middels" @@ -24665,5 +25102,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "nedfart avansert" @@ -24678,5 +25115,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "nedfart ekspert" @@ -24691,5 +25128,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "nedfart friløp" @@ -24704,5 +25141,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "nedfart nybegynner" @@ -24822,11 +25259,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "kraft" @@ -24840,5 +25277,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "brygge" @@ -24852,5 +25289,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "rørgate" @@ -24978,12 +25415,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "fritid" @@ -24997,5 +25451,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "marina" @@ -25033,4 +25487,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25049,4 +25519,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25067,8 +25545,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "fasilitet" @@ -25170,10 +25650,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "fasilitet – trafikk" @@ -25427,5 +25907,5 @@ #. #. -#. +#. #. color health #. @@ -25571,4 +26051,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25588,23 +26076,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "fasilitet – lys" @@ -25636,6 +26124,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "light_vann" @@ -25696,14 +26184,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "helse" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26050,5 +26538,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26071,5 +26558,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "butikk" @@ -26141,8 +26629,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotell" @@ -26243,9 +26731,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turisme" @@ -26333,9 +26821,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "historisk" @@ -26349,5 +26837,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "steinbrudd" @@ -26361,5 +26849,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "avfallsdeponi" @@ -26381,5 +26869,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "vannmagasin" @@ -26393,5 +26881,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "skog" @@ -26405,5 +26893,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "gårdstun" @@ -26426,5 +26914,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "butikker" @@ -26438,5 +26926,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "industri" @@ -26450,5 +26938,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "rivningsområde" @@ -26462,5 +26950,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "byggeområde" @@ -26474,5 +26962,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "jernbanegrunn" @@ -26529,7 +27017,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "millitært" @@ -26543,5 +27031,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "gravlund" @@ -26554,5 +27042,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "fjelltopp" @@ -26567,5 +27055,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "isbre" @@ -26579,5 +27067,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "vulkan" @@ -26632,8 +27120,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "natur" @@ -26647,5 +27135,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "krattskog" @@ -26659,5 +27147,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "beiteområde" @@ -26671,5 +27159,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26683,5 +27171,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "søle" @@ -26695,5 +27183,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "strand" @@ -26771,8 +27259,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "rute" @@ -26820,7 +27308,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "grense" @@ -26970,11 +27458,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "sted" @@ -27022,6 +27510,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adresse" @@ -27377,86 +27865,94 @@ msgstr "" +#~ msgid "Updating primitive" +#~ msgstr "Oppdaterer objekt" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Forventer parentes slutt." + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er " -#~ "tilgjengelig" - -#~ msgid "Images for {0}" -#~ msgstr "Bilder for {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Les GPX …" - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Ingen tid gitt for punkt {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Ingen bilder med lesbare tidsstempler funnet" - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS start: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS-slutt: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "nåværende forskjell: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "tidssone-forskjell: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} innenfor sporet." - -#~ msgid "Sync clock" -#~ msgstr "Synkronisér klokke" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Klarte ikke tolke datoen i fila «{0}»." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»." - -#~ msgid "Image" -#~ msgstr "Bilde" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "GPS-enhetens tidssone (forskjell fra foto)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Synkronisér tidspunkt med GPS-enhet" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Den indtastede tid kunne ikke tolkes" - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ – Geotaggede bilder" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Åpne bilder med AgPifoJ …" - -#~ msgid "osmarender options" -#~ msgstr "osmarender-indstillinger" +#~ "Gjeldende antall endringer overstiger maksimalt antall endringer: " +#~ "gjeldende er {0}, maksimalt er {1}" #~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Et annet geotag programtillegg for JOSM. Kobler bilder med GPS spor eller " -#~ "importerer bilder med koordinater i EXIF." - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Flere verktøy som kan gjøre livet enklere. Eksempel: forenkle linje, Slå " -#~ "sammen areal, gå til posisjon." +#~ "Jeg kan fotogragere min GPS mottaker.
Kan det være til hjelp?" + +#~ msgid "All images" +#~ msgstr "Alle bilder" + +#~ msgid "Images with no exif position" +#~ msgstr "Bilder uden EXIF-posisjon" + +#~ msgid "Not yet tagged images" +#~ msgstr "Bilder uten egenskaper" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Fant {0} treff av {1} i GPX spor {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPX-spor er lagt inn" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Forskyvning mellom spor og foto: {0}m {1}s" + +#~ msgid "Default Values" +#~ msgstr "Standardverdier" + +#~ msgid "Enable proxy server" +#~ msgstr "Bruk proxy-tjener" + +#~ msgid "Anonymous" +#~ msgstr "Anonym" + +#~ msgid "Proxy server host" +#~ msgstr "Proxy-tjenerens vert" + +#~ msgid "Proxy server port" +#~ msgstr "Proxy-tjenerens port" + +#~ msgid "Proxy server username" +#~ msgstr "Brukernavn for proxy-tjener" + +#~ msgid "Proxy server password" +#~ msgstr "Passord for proxy-tjener" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, muligens fordi egenskaper mangler." + +#~ msgid "Preparing..." +#~ msgstr "Forbereder …" + +#~ msgid "Uploading..." +#~ msgstr "Laster opp …" + +#~ msgid "Incorrect password or username." +#~ msgstr "Feil passord eller brukernavn." + +#~ msgid "Enter Password" +#~ msgstr "Skriv inn passord" + +#~ msgid "Login" +#~ msgstr "Logg inn" + +#~ msgid "Auto-tag source added:" +#~ msgstr "Automatisk egenskap: kilde er lagt inn:" + +#~ msgid "Interpolation" +#~ msgstr "Interpolasjon" + +#~ msgid "Optional" +#~ msgstr "Tillegg" + +#~ msgid "Shop" +#~ msgstr "Butikk" + +#~ msgid "aqueduct" +#~ msgstr "akvadukt" #~ msgid "Move" @@ -27655,4 +28151,46 @@ #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "Du kan bruke mus eller Ctrl+piltaster/./ for å zoome og panorere." + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Ingen bilder med lesbare tidsstempler funnet" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Ingen tid gitt for punkt {0} x {1}" + +#~ msgid "Images for {0}" +#~ msgstr "Bilder for {0}" + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS start: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "nåværende forskjell: {0}s" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS-slutt: {0}" + +#~ msgid "timezone difference: " +#~ msgstr "tidssone-forskjell: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} innenfor sporet." + +#~ msgid "Sync clock" +#~ msgstr "Synkronisér klokke" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS-enhetens tidssone (forskjell fra foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synkronisér tidspunkt med GPS-enhet" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Den indtastede tid kunne ikke tolkes" + +#~ msgid "Image" +#~ msgstr "Bilde" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)" #~ msgid "Add either site-josm.xml or Wiki Pages." @@ -27683,7 +28221,4 @@ #~ msgid "Public" #~ msgstr "Offentlig" - -#~ msgid "File could not be found." -#~ msgstr "Filen finnes ikke." #~ msgid "Add a new tagging preset source to the list." @@ -27829,4 +28364,7 @@ #~ msgstr "" #~ "Lambert sone {0} i mellomlager stemmer ikke med aktiv Lambert sone {1}" + +#~ msgid "osmarender options" +#~ msgstr "osmarender-indstillinger" #~ msgid "Request Update" @@ -27951,4 +28489,11 @@ #~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Et annet geotag programtillegg for JOSM. Kobler bilder med GPS spor eller " +#~ "importerer bilder med koordinater i EXIF." + +#~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " #~ "GPX track. This plugin can be used to prepare tracks for uploading to " @@ -27997,4 +28542,11 @@ #~ msgid "Found element in non-way." #~ msgstr "Fant element i ikke_linje." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Flere verktøy som kan gjøre livet enklere. Eksempel: forenkle linje, Slå " +#~ "sammen areal, gå til posisjon." #~ msgid "Map Type" @@ -28122,4 +28674,10 @@ #~ msgstr "Rediger stasjon" +#~ msgid "Read GPX..." +#~ msgstr "Les GPX …" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Åpne bilder med AgPifoJ …" + #~ msgid "Import TCX File..." #~ msgstr "Importer TCX-fil …" @@ -28184,4 +28742,7 @@ #~ "en fransk WMS-tjener.\n" #~ "Ikke last opp data etter denne beskjeden." + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}" #~ msgid "" @@ -28200,4 +28761,10 @@ #~ "Ikke last opp data etter denne meldingen." +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Klarte ikke tolke datoen i fila «{0}»." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»." + #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»" @@ -28205,4 +28772,7 @@ #~ msgid "Use preset ''{0}''" #~ msgstr "Bruk objektmal «{0}»" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ – Geotaggede bilder" #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" @@ -28235,7 +28805,4 @@ #~ msgid "Reached the end of the line" #~ msgstr "Nådde slutten av linja" - -#~ msgid "Reached a junction" -#~ msgstr "Nådde et kryss" #~ msgid "" @@ -28312,4 +28879,10 @@ #~ "HREF=\"{1}\">norsk (bokmål)." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er " +#~ "tilgjengelig" + #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" @@ -28347,9 +28920,4 @@ #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." -#~ msgstr "" -#~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»" - -#~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " #~ "''{1}''." Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 19198) +++ /applications/editors/josm/i18n/po/nl.po (revision 19199) @@ -4,11 +4,12 @@ # FIRST AUTHOR , 2007. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-29 22:18+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-21 21:04+0000\n" +"Last-Translator: mfvl \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Hoofdscherm aanmaken" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ongeldige URL negeren: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Waarschuwing" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ongeldige bestands-URL negeren: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Kon bestand ''{0}' niet lezen'.
Error is:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Kon bestand ''{0}' niet lezen'.
Error is:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "Over JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -280,5 +282,5 @@ "mislukken. API base URL is: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -290,5 +292,5 @@ "base URL is: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -296,16 +298,23 @@ "screen with browser windows
and take some time to finish." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +"U staat op het punt {0} browser vensters te openen.
Dit kan zowel uw " +"scherm met browser vensters vullen
als een behoorlijke tijd duren." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Doorgaan" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -314,29 +323,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -353,5 +363,10 @@ msgstr "Annuleren" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Klik om samenvoegen van knooppunten te stoppen" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -368,5 +383,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Samenvoegen" @@ -378,4 +393,6 @@ "" msgstr "" +"Er zijn geen lagen waarmee de bron laag
''{0}''
kan samenvoegen." +"" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 @@ -384,15 +401,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Knoop toevoegen..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Knoop toevoegen door invoeren lengte- en breedtegraad." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -408,22 +425,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Bewerk: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Coördinaten van de nieuwe knoop invoeren." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Decimale graden gebruiken." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatieve waarden duiden op het westelijk/zuidelijk halfrond." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -432,5 +449,5 @@ msgstr "Breedtegraad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -439,28 +456,29 @@ msgstr "Lengtegraad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +msgstr "Graag een geldige breedtegraad in voeren tussen -90 en 90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +msgstr "Graag een breedtegraad invoeren tussen -90 en 90" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +msgstr "Graag een geldige lengtegraad invoeren tussen -180 en 180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +msgstr "Graag een lengtegraad invoeren tussen -180 en 180" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -472,11 +490,11 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +msgstr "Sluit het venster en maak een nieuwe knoop" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "Sluit het venster zonder een nieuwe knoop te maken" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -495,18 +513,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -518,5 +536,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -538,6 +556,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -584,5 +602,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflict" @@ -619,14 +637,15 @@ msgstr "Geen conflicten om op in te zoomen" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +msgstr "Sluit open changesets" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +msgstr "Sluiten geopende wijzigingensets" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -636,23 +655,23 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Bestand: {0}" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "Er zijn geen geopende wijzigingensets" + #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -msgid "There are no open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +msgstr "Geen open wijzigingensets" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." -msgstr "" +msgstr "Ophalen open wijzigingensets" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 @@ -723,5 +742,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 msgid "Those nodes are not in a circle. Aborting." -msgstr "" +msgstr "Deze nodes staan niet in een circel. Opheffend" #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 @@ -737,11 +756,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -793,5 +813,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 msgid "Download parent ways/relations..." -msgstr "" +msgstr "Ophalen bovenliggende wegen/relaties" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40 @@ -803,5 +823,5 @@ #, java-format msgid "Id > 0 required, got {0}" -msgstr "" +msgstr "Id > 0 benodigd, kreeg {0}" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89 @@ -819,16 +839,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -845,24 +870,24 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231 msgid "Conflicts during download" -msgstr "" +msgstr "Conflikten gedurende ophalen" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256 #, java-format msgid "({0}/{1}) Loading parents of node {2}" -msgstr "" +msgstr "({0}/{1}) Laden van ouders van knoop {2}" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257 #, java-format msgid "({0}/{1}) Loading parents of way {2}" -msgstr "" +msgstr "({0}/{1}) Laden van ouders van weg {2}" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:258 #, java-format msgid "({0}/{1}) Loading parents of relation {2}" -msgstr "" +msgstr "({0}/{1}) Laden van ouders van relatie {2}" #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Dupliceren" @@ -892,23 +917,23 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Volledig scherm beeld" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Schakelen volledig scherm beeld" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 msgid "Toggle Fullscreen view" -msgstr "" +msgstr "Schakelen volledig scherm beeld" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Exporteren naar GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "De gegevens naar een GPX-bestand exporteren." @@ -923,12 +948,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -953,8 +978,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -965,10 +990,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -981,17 +1006,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1004,5 +1029,5 @@ #, java-format msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." -msgstr "" +msgstr "Verwachtte instantie van OsmDataLaag of GxpLaag. Kreeg \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 @@ -1028,22 +1053,27 @@ msgstr "Toon objectinformatie over OSM wegen, knopen of relaties." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Overlappende gebieden samenvoegen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Overlappende gebieden samenvoegen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Selecteer minstens één gesloten weg die samengevoegd moet worden." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Op dit moment kunnen maximaal twee gebieden worden samengevoegd." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" is niet gesloten en kan daarom niet worden samengevoegd." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1057,38 +1087,34 @@ "Weet je zeker dat je verder wilt gaan?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Breek af als je het niet zeker weet" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Selecteer minstens één gesloten weg die samengevoegd moet worden." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgstr "Geen kruispunt gevonden. Er is niets veranderd" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgstr "Knooppunten toegevoegd op alle kruispunten" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgstr "Wegen die niet deel van een binnenste multipoligoon zijn verwijderd" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgstr "Relaties gerepareerd" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgstr "Zichzelf overlappend gebied samengevoegd" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +msgstr "Zichzelf overlappend gebied samengevoegd" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1098,35 +1124,35 @@ "of er geen fouten zijn geïntroduceerd." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Waarden voor alle conflicten invoeren." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Conflicten oplossen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgstr "Repareer tag conflikten" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgstr "elementen verwijderd van relaties" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgstr "Samenvoegen gebieden: Korte wegen verwijderd" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgstr "Gesloten weg" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgstr "Tags van binnenste wegen verwijderd" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" -msgstr "" +msgstr "Gebied samenvoeg functie" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 @@ -1193,9 +1219,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" -msgstr "" +msgstr "Voeg laag samen" #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge the current layer into another layer" -msgstr "" +msgstr "Voeg de huidige laag toe in een andere laag" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46 @@ -1214,9 +1240,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 msgid "Abort Merging" -msgstr "" +msgstr "Stop samenvoegen" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128 msgid "Click to abort merging nodes" -msgstr "" +msgstr "Klik om samenvoegen van knooppunten te stoppen" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 @@ -1225,4 +1251,6 @@ "Cannot merge nodes: Would have to delete way ''{0}'' which is still used." msgstr "" +"Kan knooppunten niet samenvoegen: zou weg \"{0}\" moeten verwijderen, deze " +"is in gebruik" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 @@ -1238,5 +1266,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 msgid "Merge the currently selected primitives into another layer" -msgstr "" +msgstr "Voeg de huidig geselecteerd primitieven toe in een andere laag" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 @@ -1290,5 +1318,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kan objecten niet buiten de wereld plaatsen." @@ -1366,30 +1394,30 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109 msgid "Download Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +msgstr "Haal gegevens op" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Vorm orthogonaal maken" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Knopen zodanig verplaatsen dat alle hoeken 90 of 270 graden zijn." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1398,9 +1426,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1409,16 +1437,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Orthogonaal maken" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Gebruik" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Orthogonaal maken" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1445,6 +1473,6 @@ msgid "Pasting {0} tag" msgid_plural "Pasting {0} tags" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Plakken {0} tag" +msgstr[1] "Plakken {0} tags" #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 @@ -1452,6 +1480,6 @@ msgid "to {0} primitive" msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "aan {0} primitief" +msgstr[1] "aan {0} primitieven" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 @@ -1491,18 +1519,18 @@ msgstr "Kon bestand ''{0}'' niet hernoemen" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Wegen omkeren" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "De richting van alle geselecteerde wegen omkeren." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Selecteer minstens één weg." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Wegen omkeren" @@ -1511,10 +1539,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Opslaan" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Huidige gegevens opslaan." @@ -1571,10 +1599,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Opslaan als..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "De huidige gegevens in een nieuw bestand opslaan." @@ -1618,6 +1646,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1652,5 +1679,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1716,11 +1743,13 @@ "selecteer knopen in het midden van de weg.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " "should verify this and correct it when necessary." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +"Een rol gebaseerde relatie lidmaatschap is gekopieerd naar alle nieuwe " +"ways.
Graag controleren en aanpassen indien nodig." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1730,5 +1759,5 @@ "
Controleer dit en corrigeer dit waar nodig." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1762,34 +1791,34 @@ msgstr "De knoop is met niets anders verbonden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Geen van deze knopen is met iets anders verbonden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Geen van deze wegknopen is met iets anders verbonden" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "De huidige selectie kan niet worden gebruikt voor het losmaken." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Selecteer één van beide:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Een getagde knoop, of" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* een knoop die gebruikt is door meer dan een weg, of" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1798,5 +1827,5 @@ "weg, of" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1805,5 +1834,5 @@ "één weg." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1817,9 +1846,9 @@ "geselecteerd worden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Ongebonden knoop" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1827,5 +1856,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1860,64 +1889,61 @@ msgstr "Alles (escape) deselecteren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Update data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." -msgstr "" +msgstr "Ververst de objecten in de aktieve data laag vanaf de server" #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +msgstr "Ophalen data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +msgstr "Geen huidige dataset gevonden" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgstr "Kon geen object met id {0} in de huidige dataset vinden" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Ververs selectie" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +"Update de huidige geselecteerde objecten van de server (herdownload data)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Update selectie" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "Er zijn geen objecten geselecteerd om te verversen" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selectie leeg" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Upload data" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +msgstr "Verstuur alle wijzigingen in de aktieve data laag naar de OSM server" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1928,5 +1954,5 @@ "op te lossen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1934,131 +1960,7 @@ msgstr "Geen aanpassingen aanwezig om te uploaden." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Niets om te uploaden. Creëer eerst gegevens." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Synchroniseer alleen relatie {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synchroniseer alle gegevens" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Conflicten gedetecteerd" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Data aan het uploaden voor laag ''{0}''" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2068,18 +1970,18 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46 msgid "Upload all changes in the current selection to the OSM server." -msgstr "" +msgstr "Verstuur alle wijzigingen in de huidige selectie naar de OSM server" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:258 msgid "Checking parents for deleted objects" -msgstr "" +msgstr "Controleren van ouders voor verwijderde objecten" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:317 #, java-format msgid "Reading parents of ''{0}''" -msgstr "" +msgstr "Lezen ouders van \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:323 msgid "Checking for deleted parents in the local dataset" -msgstr "" +msgstr "Controleren van verwijderde ouders in de lokale dataset" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23 @@ -2090,5 +1992,5 @@ #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25 msgid "Enable/disable rendering the map as wireframe only" -msgstr "" +msgstr "Renderen van de kaart als draadmodel aanzetten/uitzetten" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26 @@ -2193,15 +2095,16 @@ msgstr "Gedownloade GPX-gegevens" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Gegevens worden gedownload" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" "Ignoring exception because download has been cancelled. Exception was: {0}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +"Negeren uitzondering omdat ophalen afgebroken is. Uitzondering was: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "Geen data in dit gebied gevonden." @@ -2218,5 +2121,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157 msgid "Check on the server" -msgstr "" +msgstr "Controleer op de server" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159 @@ -2225,4 +2128,6 @@ "server" msgstr "" +"Klik om te controleren of objecten in uw huidige dataset verwijderd zijn op " +"de server" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163 @@ -2233,5 +2138,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165 msgid "Click to abort and to resume editing" -msgstr "" +msgstr "Klik oom af te breken, en verder te gaan met wijzigen" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170 @@ -2244,13 +2149,18 @@ " to ignore.
" msgstr "" +"Er zijn {0} primitieven in uw lokale dataset die
verwijderd zouden " +"kunnen zijn op de server. Indien u deze later probeert te verwijderen of " +"wijzigen
zal de server waarschijnlijk een
conflikt rapporteren." +"

Klik {1} om de staat van deze primitieven
op de " +"server te controleren.
Klik {2} om te negeren.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 msgid "Deleted or moved primitives" -msgstr "" +msgstr "Verwijderde of verplaatste primitieven" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251 #, java-format msgid "The following errors occurred during mass download: {0}" -msgstr "" +msgstr "De volgende fouten traden op gedurende bulk ophalen: {0}" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 @@ -2261,5 +2171,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" -msgstr "" +msgstr "Fouten tijdens ophalen" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93 @@ -2272,7 +2182,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2289,58 +2199,52 @@ "behouden bij verwijderen van een weg. CTRL: verwijzende objecten verwijderen." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Tekenen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Knopen tekenen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Modus: tekenmodus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "geselecteerd" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Kan geen knoop buiten de wereld toevoegen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Knoop toevoegen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Knoop in weg toevoegen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Bestaande weg aan knoop koppelen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Een nieuwe knoop aan een bestaande weg toevoegen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Knoop in weg voegen en verbinden" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Nieuwe node maken." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Selecteer de node onder de cursor." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2349,14 +2253,14 @@ msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Start een nieuwe weg vanaf de node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Weg voortzetten vanaf laatste knoop." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Tekenen beëindigen" @@ -2377,5 +2281,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 msgid "Move a segment along its normal, then release the mouse button." -msgstr "" +msgstr "Verplaats een segment langs zijn normaal, en laat de muisknop los" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2390,4 +2294,6 @@ "its normal." msgstr "" +"Sleep een wegdeel om een rechthoek te maken. Ctrl-sleep om een segment langs " +"zijn loodlijn te verplaatsen." #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2399,18 +2305,19 @@ "te spelen; SHIFT+loslaten om het geluid op dat punt te synchroniseren." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Selecteer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Objecten selecteren, verplaatsen en roteren" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2419,17 +2326,17 @@ msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Verplaats elementen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +msgstr "Verplaats ze" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Verplaatsing ongedaan maken" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2439,13 +2346,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Altijd verplaatsen en dialoogvenster niet meer laten zien" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2454,9 +2361,9 @@ "met dichtstbijzijnde knoop." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "De muisknop loslaten om het roteren te stoppen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2468,5 +2375,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zoom" @@ -2490,5 +2397,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Naar objecten zoeken." @@ -2498,5 +2405,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." -msgstr "" +msgstr "Geef een filter string." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 @@ -2506,5 +2413,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "" +msgstr "Geef de zoekterm" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 @@ -2522,5 +2429,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" -msgstr "" +msgstr "zoek in selectie" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 @@ -2578,64 +2485,88 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "gebruiker:... - alle objecten veranderd door gebruiker" +msgstr "" +"user:anonymous - alle objekten gewijzigd door anonieme gebruikers" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" -msgstr "" +msgstr "id:... - objekt met opgegeven ID (0 voor nieuwe objekten)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - object met opgegeven aantal knopen" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" +"tags:... - objekt met bepaald aantal tags (tags:aantal of tags:min-" +"max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" "max)" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +"tags:... - objekt met bepaald aantal tags (tags:aantal of tags:min-" +"max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - alle aangepaste objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - alle geselecteerde objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - alle incomplete objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "ongetagd - alle objecten zonder tag" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +"kind expr - alle kinderen van objekten die aan de expressie " +"voldoen" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +"ouder expr - alle ouders van objekten die aan de expressie " +"voldoen" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Gebruik | of OR om te combineren met een logische OR" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Gebruik \" om operanten aan te halen (b.v. als sleutel \":\" bevat)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Gebruik ( en ) om expressies te groeperen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2643,55 +2574,55 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Zoeken" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +msgstr "Aktiveer filter" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Start zoeken" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Geen overeenkomst gevonden voor ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Zoeken naar ''{0}'' heeft de selectie niet verkleind." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +msgstr "Niets gevonden in selectie met zoeken op \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "{0} overeenkomsten gevonden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2705,40 +2636,46 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +"Sleutel kan niet leeg zijn wanneer de tag-operator wordt gebruikt. Voorbeeld " +"van gebruik: sleutel=waarde." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +msgstr "Patroon syntax fout: Patroon {0} in {1} is illegaal!" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +"Onbekende primitief: {0}. Toegestane waarden zijn knoop, weg of relatie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Onverwacht token: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Ontbrekende argumenten voor OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Ontbrekend argument voor NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Sluithaak verwacht." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Ontbrekende argumenten voor OR." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +msgstr "Verkeerd aantal parameters voor tags operator" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2746,10 +2683,12 @@ "or range, for example tags:1 or tags:2-5" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +"Onjuist aantal waardes voor tags operator: {0}. Tags operator verwacht " +"aantal tags, of bereik, bijvoorbeeld tags:1 of tags:2-5" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +msgstr "Onjuit aantal parameters voor knooppunten operator" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2757,9 +2696,16 @@ "nodes or range, for example nodes:10-20" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +"Onjuiste waarde voor knooppunten operator: {0}. Knooppunten operator " +"verwacht aantal knooppunten, of bereik, bijvoorbeeld knooppunten:10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" +msgstr "Onjuiste waarde van id operator: {0}. Verwachtte nummer" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." +msgstr "Onjuiste waarde van id operator: {0}. Verwachtte nummer" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 @@ -2792,45 +2738,37 @@ msgstr "Error tijdens het communiceren met de server." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Het aantal wijzigingen overschrijdt het maximum, huidig is {0}, maximum is " -"{1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 -msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 #, java-format msgid "" "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format +"Waarschuwing: automatisch afkappen van waarde van tag \"{0}\" van verwijderd " +"objekt {1}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format msgid "" "Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" -"Lengte van de waarde voor label \"{0}\" van onderdeel {1} overschrijdt de " -"maximumwaarde {2}. De lengte is nu {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 +"Lengte van waarde voor tag \"{0}\" van object {1} overschrijdt de max. " +"toegestane lengte {2}. De lengte van de waarde is {3}." + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "{0} knopen in weg {1} overschrijdt het maximum aantal knopen {2}" +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 +msgid "API Capabilities Violation" +msgstr "API Vermogens inbreuk" + #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 msgid "Cyclic dependency between relations:" -msgstr "" +msgstr "Wederzijdse afhankelijkheid tussen relaties:" #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47 @@ -2841,4 +2779,7 @@ "dependency." msgstr "" +"{0} relaties maken een circel omdat ze naar elkaar verwijzen.
JOSM " +"kan ze niet versturen. Graag de relaties aanpassen door de wederzijdse " +"afhankelijkheid te verwijderen." #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 @@ -2872,5 +2813,5 @@ #, java-format msgid "Added {0} objects" -msgstr "" +msgstr "{0} objecten toegevoegd" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 @@ -2892,10 +2833,10 @@ #, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "" +msgstr "Vervang \"{0}\" met knooppunt \"{1}\"" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 #, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "" +msgstr "Vervang \"{0}\" met weg \"{1}\"" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 @@ -2907,15 +2848,15 @@ #, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "" +msgstr "Zet {0}={1} voor knooppunt ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 #, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "" +msgstr "Zet {0}={1} voor weg ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 #, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "" +msgstr "Zet {0}={1} voor relatie ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2938,5 +2879,5 @@ msgstr "Stel in {0}={1} voor {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2949,7 +2890,9 @@ "conflict can't be added." msgstr "" +"Laag ''{0}'' heeft reeds een conflikt voor primitief
''{1}''." +"
Dit conflikt kan niet worden toegevoegd." #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Dubbel conflict" @@ -2961,4 +2904,6 @@ "primitive ''{1}''." msgstr "" +"Waarschuwing: Laag ''{0}'' bestaat niet meer. 'Kan niet verwijderen' " +"conflikt voor primitief ''{1}''." #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2974,4 +2919,6 @@ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" +"Kan commando \"{0}\" niet terugdraaien omdat laag \"{1}\" niet meer " +"aanwezig is" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 @@ -2984,5 +2931,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." -msgstr "" +msgstr "Kan onbepaald conflik niet oplossen" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:57 @@ -2990,13 +2937,13 @@ #, java-format msgid "Parameter ''{0}'' must not be empty" -msgstr "" +msgstr "Parameter \"{0}\" mag niet leeg zijn" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 msgid "At least one object to delete required, got empty collection" -msgstr "" +msgstr "Ten minste een te verwijderen object nodig, kreeg lege verzameling" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 msgid "At least one object to delete requird, got empty collection" -msgstr "" +msgstr "Tenminste één object benodigd voor verwijderen, kreeg lege verzameling" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177 @@ -3050,4 +2997,19 @@ msgstr "Conflicten in verwijderde toestand oplossen in {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3060,10 +3022,10 @@ #, java-format msgid "Purged object ''{0}''" -msgstr "" +msgstr "Object \"{0}\" verwijderd" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 #, java-format msgid "Purged {0} objects" -msgstr "" +msgstr "\"{0}\" objecten verwijderd" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 @@ -3082,5 +3044,5 @@ #, java-format msgid "Resolve conflicts in member list of relation {0}" -msgstr "" +msgstr "Los conflikten op in leden lijst van relatie {0}" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3159,5 +3121,5 @@ msgstr "Toepassen?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3242,15 +3204,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "Configuratiebestand is verminkt in regels {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3259,5 +3221,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3266,5 +3228,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3273,5 +3235,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3280,5 +3242,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3286,5 +3248,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3293,5 +3255,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3300,5 +3262,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3307,5 +3269,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3314,10 +3276,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3325,24 +3287,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Voorkeuren opgeslagen op {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Kan geen voorkeuren uploaden. Reden: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Kan geen voorkeuren van server laden." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3351,5 +3313,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3378,5 +3340,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3398,31 +3360,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "Z" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "W" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3430,5 +3385,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3439,27 +3394,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3467,5 +3422,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3477,5 +3432,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3483,25 +3438,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3509,43 +3464,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Parameter ''{0}'' mag niet null zijn" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3553,5 +3520,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3579,10 +3546,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3590,7 +3553,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3605,5 +3568,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3621,146 +3584,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Oppervlak van weg is niet gesloten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Multipolygone weg \"{0}\" is niet gesloten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Lid \"{0}\" in relatie wissen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Weg \"{0}\" met minder dan twee punten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Meer dan een \"van\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Meer dan een \"naar\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Meer dan éé \"via\" gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Onbekende rol \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Onbekend lidtype voor \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Geen \"van\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Geen \"naar\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Geen \"via\"-knoop of -weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Stijl voor beperking {0} is niet gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Binnenweg \"{0}\" is uitwendig." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Niet-weg \"{0}\" in multipolygoon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Geen buitenweg voor multipolygoon \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "niet-getagd" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "tekst" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Fout: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Waarschuwing: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "inactief" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "geselecteerd" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3769,6 +3724,6 @@ msgstr[1] "knopen" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3777,7 +3732,8 @@ msgstr[1] "wegen" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3786,21 +3742,37 @@ msgstr[1] "relaties" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "ongetagde weg" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "incomplete weg" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "achtergrond" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "markeren" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "niet-getagd" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "tekst" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3942,5 +3914,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "spoorweg" @@ -3956,7 +3928,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3972,4 +3944,10 @@ msgstr[1] "{0} leden" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4001,6 +3979,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Conflict" @@ -4014,7 +3992,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4101,74 +4079,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Gebruikersnaam" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Wachtwoord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "gebruik" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "opties" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Deze hulptekst tonen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Standaard UNIX-geometrieargument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Het omgrensde gebied downloaden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Open bestand (als rawe GPS, indien .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Het omgrensde gebied downloaden als rawe GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Met de opgegeven zoekactie selecteren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Gemaximaliseerd openen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "De voorkeuren herstellen op standaardwaarden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "De taal instellen." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4177,9 +4155,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "voorbeelden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4189,25 +4167,25 @@ "zorg dat je wat gegevens laadt voor --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "In plaats van --download= kun je ook osm:// opgegeven\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Bijgewerkte plugins activeren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Vroege plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Standaarden instellen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -4216,11 +4194,11 @@ "gebruikt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Bestand" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4235,22 +4213,22 @@ msgstr "Bewerken" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Beeld" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Gereedschappen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Voorkeuze" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4258,5 +4236,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Geluid" @@ -4335,13 +4313,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "laag niet in lijst." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4377,5 +4356,5 @@ msgstr "Initialiseren" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4383,6 +4362,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4391,5 +4370,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4398,5 +4377,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4405,25 +4384,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4431,9 +4410,9 @@ msgstr "Rol" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4465,11 +4444,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Eigenschappen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4478,6 +4457,6 @@ msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4485,6 +4464,6 @@ msgstr "Knopen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4492,40 +4471,40 @@ msgstr "Leden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Geen tag-conflicten om op te lossen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags ({0} conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} tag-conflicten om op te lossen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Knopen (opgelost)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Knopen (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Conflicten in de knopen van deze weg" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Leden (opgelost)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4533,21 +4512,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Leden (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Geen eigenschapsconflicten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Eigenschappen (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4579,22 +4558,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Vergelijk " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Mijn versie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4602,5 +4581,5 @@ msgstr "Samengevoegde versie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4608,30 +4587,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Hun versie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> boven" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> beneden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4639,5 +4618,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4645,14 +4624,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4660,5 +4639,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4666,23 +4645,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Omhoog" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Geselecteerde elementen één positie omhoog schuiven" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Omlaag" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4693,27 +4672,27 @@ msgstr "Verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Vastzetten" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Vastzetten" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4722,5 +4701,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4729,5 +4708,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4736,5 +4715,5 @@ msgstr[1] "Mijn versie ({0} invoeren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4743,5 +4722,5 @@ msgstr[1] "Samengevoegde versie ({0} invoeren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4750,5 +4729,5 @@ msgstr[1] "Hun versie ({0} invoeren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4758,5 +4737,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4991,10 +4970,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5004,10 +4983,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5092,9 +5071,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5102,6 +5081,6 @@ msgstr "geen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "alles" @@ -5190,7 +5169,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5200,6 +5179,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5307,4 +5286,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Geselecteerde objecten verwijderen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Wijzigingenset gesloten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Downloaden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Kaart downloaden van de OSM-server." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Sluiten geopende wijzigingensets" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Een editor voor de geselecteerde relatie openen" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5318,12 +5349,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5341,13 +5372,13 @@ msgstr "Opdrachtenlijst: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5355,6 +5386,6 @@ "lijst openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5364,25 +5395,25 @@ "in de bovenstaande lijst." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Opgeloste conflicten toepassen en dialoog sluiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Doorgaan met oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5394,26 +5425,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Conflicten oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5424,41 +5455,41 @@ msgstr "Toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5497,5 +5528,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5510,34 +5541,34 @@ msgstr "Een lijst met alle geladen lagen openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "De geselecteerde laag verwijderen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Tonen/Verbergen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Zichtbaarheid van een laag in- of uitschakelen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "De geselecteerde laag een rij omhoog verplaatsen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "De geselecteerde laag een rij omlaag verplaatsen." @@ -5547,5 +5578,177 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relaties" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Een lijst met alle relaties openen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relaties: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Een editor voor de geselecteerde relatie openen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "De geselecteerde relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Een nieuwe relatie aanmaken" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Huidige selectie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Een selectielijstscherm openen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Naar de geselecteerde element(en) zoomen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Op selectie inzoomen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Sel.: Rel.:{0} / Wegen:{1} / Knopen:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Selectie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Selectie: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Laat paneel drijven" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Sluit dit paneel. U kunt het opnieuw openen met de knoppen in de linker " +"werkbalk." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Klik om de paneelinhoud te verkleinen/vergroten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Auteurs" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Een lijst openen met mensen die aan de geselecteerde objecten werken." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Auteur" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Objecten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "onvolledig" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "afgesloten weg" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Ophalen open wijzigingensets" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5554,22 +5757,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Waarden aanpassen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5578,5 +5781,5 @@ msgstr[1] "Eigenschappen van {0} objecten aanpassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5585,228 +5788,71 @@ msgstr[1] "Dit verandert {0} objecten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Selecteer een sleutel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Selecteer een waarde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Eigenschappen/Lidmaatschappen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Eigenschappen voor geselecteerde objecten." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Lid van" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Eigenschappen toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Eigenschappen: {0} / Leden: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Eigenschappen / Leden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Relatie wijzigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Uit relatie verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Selectie uit relatie {0} zeker verwijderen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "De geselecteerde sleutel in alle objecten verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Eigenschappen verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Een nieuwe sleutel/waarde aan alle objecten toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relaties" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Een lijst met alle relaties openen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relaties: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Een editor voor de geselecteerde relatie openen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "De geselecteerde relatie verwijderen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Een nieuwe relatie aanmaken" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Huidige selectie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Een selectielijstscherm openen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Naar de geselecteerde element(en) zoomen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Op selectie inzoomen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Sel.: Rel.:{0} / Wegen:{1} / Knopen:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Selectie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Selectie: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Laat paneel drijven" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Sluit dit paneel. U kunt het opnieuw openen met de knoppen in de linker " -"werkbalk." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Klik om de paneelinhoud te verkleinen/vergroten" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Auteurs" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Een lijst openen met mensen die aan de geselecteerde objecten werken." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Auteur" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Objecten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5868,14 +5914,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Alle incomplete wegen en daarbij behorende knopen downloaden" -msgstr[1] "Alle incomplete wegen en daarbij behorende knopen downloaden" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Locatie downloaden" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5898,14 +5943,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Voorinstelling toepassen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Een editor voor de geselecteerde relatie openen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5914,14 +5957,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5931,9 +5974,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5943,15 +5986,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5959,5 +6002,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5965,20 +6008,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5987,70 +6030,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Sport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6059,9 +6101,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6070,48 +6112,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Leden downloaden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6121,34 +6162,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6260,10 +6301,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6273,5 +6314,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6357,9 +6398,4 @@ msgid "Download Area" msgstr "Gebied downloaden" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Downloaden" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6660,6 +6696,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6672,6 +6706,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6942,4 +6974,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7162,5 +7198,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7203,116 +7239,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Naam" @@ -7336,15 +7372,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Soort" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7515,10 +7551,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7526,5 +7562,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7532,9 +7568,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7649,6 +7685,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "onbekend" @@ -7670,13 +7706,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7711,4 +7747,137 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Synchroniseer alleen node {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Synchroniseer alleen weg {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Synchroniseer alleen relatie {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synchroniseer alle gegevens" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Versturen mislukt omdat de server een nieuwere versie " +"van een
van uw knooppunten, wegen, of relaties heeft gevonden.
Het " +"conflict is veroorzaakt door de {0} met id {1},
de server heeft versie {2}, uw versie is {3}.

Klik " +"{4} om alleen het foutieve item te synchronizeren.
Klik " +"{5} om de volledige dataset met de server te synchronizeren." +"
Klik {6} om af te breken, en verder te gaan met " +"aanpassingen.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Conflicten gedetecteerd" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Versturen mislukt omdat de server een nieuwere versie " +"van een
van uw knooppunten, wegen of relaties heeft gevonden." +"

Klik {0} om de volledige dataset te synchronizeren " +"met de server.
Klik {1} om af te breken, en verder te " +"gaan met aanpassingen.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"Versturen mislukt omdat u
wijzigingenset {0} " +"heeft gebruikt, welke reeds gesloten was op {1}.
Gaarne opnieuw versturen " +"met een nieuwe of bestaande open wijzigingenset." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Wijzigingenset gesloten" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "Voorbereiden conflikt oplossen" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "Klik om alle ouders voor knooppunt {0} op te halen" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "Klik om af te breken, en door te gaan met het wijzigen van de kaart" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" +"Versturen mislukt omdat u node {0} probeerde te " +"verwijderen. Deze is nog in gebruik in weg {1}.

Klik {2} om alle ouder wegen op te halen van knooppunt {0}.
Indien nodig " +"zal JOSM conflikten aanmaken die u kunt oplossen met behulp van het Conflikt " +"Oplossen venster." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "Knooppunt nog in gebruik" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "Waarschuwing: fout kop \"{0}\" komt niet overeen met verwacht patroon" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Beschrijf kort de veranderingen die je upload:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7727,39 +7896,147 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Aanpassingen uploaden" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Changeset sluiten" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Gebruikersnaam en wachtwoord opslaan (onversleuteld)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Voer een gebruikersnaam in" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Waarschuwing: het wachtwoord wordt onversleuteld verstuurd." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Atletiek" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Relatie wijzigen" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7826,17 +8103,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7849,9 +8126,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7865,9 +8142,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7882,50 +8159,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Negeer veranderingen en verlaat JOSM" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7933,5 +8210,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -8004,40 +8281,380 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Ververs objecten" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "piste_gevorderden" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Beschikbare plugins configureren" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Data aan het uploaden voor laag ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Aanpassingen uploaden" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Data aan het uploaden voor laag ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Over" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Klik om samenvoegen van knooppunten te stoppen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Er zijn geen objecten geselecteerd om te verversen" +msgstr[1] "Er zijn geen objecten geselecteerd om te verversen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Wijzigingenset gesloten" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Waarschuwing: object \"{0}\" is reeds verwijderd op de server. Sla dit " +"object over, versturen wordt opnieuw uitgevoerd" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "Object \"{0}\" is reeds verwijderd. Sla object over met versturen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "Versturen van {0} objecten ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" +"Negeer uitzondering omdat versturen afgebroken is. De uitzondering is: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Selecteer een rij om te verwijderen." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Objecten om toe te voegen:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Objecten om te bewerken:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Objecten om aan te verwijderen:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8046,5 +8663,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8053,5 +8670,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8060,208 +8677,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Aanpassingen uploaden" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Voer eerst de gewenste coördinaten in." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Beschrijf kort de veranderingen die je upload:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} meters" -msgstr[1] "{0} meters" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Voer een gebruikersnaam in" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "GPS-punt" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Lijntekening aanpassen" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Algemene instellingen gebruiken." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Lijnen tussen punten in deze laag tekenen." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Geen lijnen tussen punten in deze laag tekenen." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Lijntekenopties selecteren" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8269,5 +8715,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8276,5 +8722,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8356,5 +8802,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Beschrijving" @@ -8386,10 +8832,10 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Naar gegevenslaag omzetten" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8399,12 +8845,12 @@ "zijn.
Als je sporen wilt uploaden, kijk dan hier:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8413,29 +8859,29 @@ msgstr "Omgezet van: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Uit OSM langs deze track downloaden" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Alles downloaden binnen:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} meters" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Maximum oppervlak per verzoek:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8446,9 +8892,9 @@ "verder
gaan?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8458,5 +8904,5 @@ "de track zijn overgeslagen of naar de start verplaatst." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8466,23 +8912,23 @@ "kunnen schatten, zijn overgeslagen." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Gegevenslaag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "buiten gedownload gebied" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "versie {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8491,5 +8937,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8503,5 +8949,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8514,11 +8960,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8527,36 +8973,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} bestaat uit:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "API-versie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Naar GPX-laag omzetten" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8564,5 +9010,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8571,5 +9017,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8577,5 +9023,5 @@ msgstr[1] "Punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8584,5 +9030,5 @@ msgstr[1] "Een track met {0} punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8591,5 +9037,5 @@ msgstr[1] "{0} bestaat uit {1} tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8598,24 +9044,24 @@ msgstr[1] "{0} punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX-bestanden (*.gpx, *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Bestand {0} is geladen met de naam \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Fout tijdens ontleden {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Kan \"{0}\" niet lezen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8627,34 +9073,34 @@ "een tijdzone

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Fototijd (uit exif):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "GPS-tijd (lees uit de bovenstaande foto): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Ik bevind mij in tijdzone: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Geen datum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Open een andere foto" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "De tijd met een foto van de GPS-ontvanger synchroniseren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8664,70 +9110,157 @@ "Gebruik de verwachte indeling a.u.b." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Ongeldige datum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX-track: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Een ander GPX-spoor openene" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Automatisch schatten" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Locatie bijwerken van: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Tijdzone: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Verschuiving:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Ik kan een foto van mijn GPS-ontvanger maken.
Zou dat helpen?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Locatie bijwerken van: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alle afbeeldingen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Afbeelding zonder EXIF-locatie" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Nog niet getagde afbeeldingen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Niets geselecteerd!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "{0} van de {1} foto's komen overeen met GPX-track." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Verband tussen afbeeldingen en GPX-tracks leggen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Correleer" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Automatisch schatten" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Ongeldige tijdzone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Ongeldige verschuiving" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Tracing" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Tijdzone: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Minuten: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Seconden: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Tijdverschil van {0} dagen)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "Koppelen van foto's aan track is mislukt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Tijdzone en tijdverschil aanpassen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "De selecteerde foto's bevatten geen tijdinformatie." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Foto's bevatten geen tijdinformatie." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX-track heeft geen tijdinformatie" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "U mag een GPX-track selecteren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "Geen GPX-tracks geselecteerd" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8738,9 +9271,5 @@ "Verwachte indeling: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Ongeldige tijdzone" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8751,135 +9280,56 @@ "Verwachte indeling: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Ongeldige verschuiving" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "{0} overeenkomsten van {1} gevonden in GPX-track {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX-track geladen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "De selecteerde foto's bevatten geen tijdinformatie." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Foto's bevatten geen tijdinformatie." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX-track heeft geen tijdinformatie" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Tijdzone: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minuten: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Seconden: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "{0} van de {1} foto's komen overeen met GPX-track." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Tijdverschil van {0} dagen)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Koppelen van foto's aan track is mislukt" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Tijdzone en tijdverschil aanpassen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standaardwaarden" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "GPS-locaties uit EXIF halen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Mappenscan starten" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Foto's lezen..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Lezen {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Kan geen canoniek pad voor map {0} krijgen\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Map {0} scannen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Leeg bestand in {0} gevonden\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Bestanden uit map {0} halen is mislukt\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Geotagged afbeeldingen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Met GPX relateren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8887,52 +9337,100 @@ msgstr[1] "afbeeldingen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} zijn getagd als GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Altijd verplaatsen en dialoogvenster niet meer laten zien" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Bestand kon niet gevonden worden." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Geen afbeelding" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "{0} laden" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Bestand {0} gaat fout" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Toon geogetagde foto's" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Vorige" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Vorige afbeelding" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Omschakelen: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Foto uit laag verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Uit relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Volgende" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Volgende afbeelding" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Beeld centreren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Zoom optimaal en 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8943,5 +9441,5 @@ "Hoogte: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9044,4 +9542,12 @@ msgid "Error displaying URL" msgstr "Fouten tijden tonen URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9271,7 +9777,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Alles" @@ -9340,6 +9845,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Fiets" @@ -9741,31 +10246,91 @@ msgstr "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Proxyserver inschakelen" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anoniem" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Hostel" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Poort:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Wachtwoord" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Proxyinstellingen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Proxyserverhost" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Proxyserverpoort" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Gebruikersnaam proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Wachtwoord proxyserver" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "De basis-URL voor de OSM-server (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "URL-basisserver" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM-wachtwoord" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10071,5 +10636,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10079,13 +10644,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10093,18 +10658,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Optionele attributen:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "afgesloten weg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Onbekend type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10115,16 +10680,16 @@ msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Fout bij ontleden van {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementen van type {0} worden ondersteund." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10133,18 +10698,18 @@ msgstr[1] "{0} objecten wijzigen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Niets geselecteerd!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Selectie is ongeschikt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Voorinstelling toepassen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Eigenschappen veranderen" @@ -10173,4 +10738,11 @@ msgstr "Downloaden van punten {0} tot {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10186,12 +10758,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointer-uitzondering, mogelijk ontbreken er tags." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Gegevens voorbereiden..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10294,16 +10921,16 @@ msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10313,40 +10940,40 @@ msgstr "OSM-gegevens downloaden" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10354,10 +10981,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Downloaden van punten {0} tot {1}..." -msgstr[1] "Downloaden van punten {0} tot {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10394,14 +11021,14 @@ msgstr "Importeren NMEA is mislukt!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10410,16 +11037,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10427,66 +11054,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Changeset sluiten" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Voorbereiden…" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Uploaden..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Gegevens voorbereiden..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Versturen van {0} objecten ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10512,4 +11150,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10521,5 +11169,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10546,5 +11194,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10552,5 +11200,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10563,5 +11211,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10572,58 +11220,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Verkeerd wachtwoord of gebruikersnaam." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Waarschuwing: het wachtwoord wordt onversleuteld verstuurd." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Gebruikersnaam en wachtwoord opslaan (onversleuteld)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Voer wachtwoord in" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Login" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "De basis-URL voor de OSM-server (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "URL-basisserver" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM-wachtwoord" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10713,5 +11309,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10720,38 +11323,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10759,19 +11362,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Incomplete -specificatie met ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Ongeldig object met id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10781,8 +11384,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10792,25 +11395,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10818,5 +11437,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10825,5 +11444,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10831,5 +11450,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10838,13 +11457,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "OSM-gegevens voorbereiden..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10867,21 +11486,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Ophalen open wijzigingensets" +msgstr[1] "Ophalen open wijzigingensets" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Ophalen open wijzigingensets" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10909,9 +11540,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10971,5 +11598,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10979,4 +11606,9 @@ msgid "Uploading data ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Verwijderde of verplaatste primitieven" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11018,12 +11650,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "{1} {0} verwijderen" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Fout tijdens verwijderen plugin-bestand: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11167,9 +11799,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "geen omschrijving beschikbaar" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11301,4 +11933,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Parameter \"{0}\" mag niet leeg zijn" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11588,6 +12235,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Sporen uploaden" @@ -11673,5 +12320,5 @@ msgstr "GPX-track uploaden" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Sporen naar openstreetmap.org uploaden" @@ -11682,5 +12329,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Adresinterpolatie" @@ -11695,11 +12342,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Oneven" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Even" @@ -11710,24 +12354,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Nummer" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "Natuurlijk" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "afbeelding" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Verhuur" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11745,7 +12385,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "binnensegment" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11858,5 +12497,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11918,21 +12557,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Gemeente selecteren" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Kies uit..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Kadaster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Automatisch vullen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11941,13 +12580,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11972,17 +12611,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Automatisch bufferen inschakelen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Max. buffergrootte (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11994,9 +12633,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "Franse kadaster WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -12004,10 +12643,10 @@ "ingeschakeld" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Bron" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12017,5 +12656,5 @@ "in de JOSM-voorkeuren is opgegeven." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12025,9 +12664,9 @@ "tekst op donkere achtergronden." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Stapelen van meerdere lagen toestaan" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -12035,37 +12674,37 @@ "doorzichtig." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Een rechthoek om de gedownloade gegevens van de WMS-server tekenen." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Neem kleinere afbeeldingen (hogere kwaliteit, maar gebruikt meer geheugen)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Vaste vierkant groote (standaard is 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Vaste groote (van 25 tot 1000 meter)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -12073,9 +12712,6 @@ "overschreden." -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Bron auto-tag toegevoegd:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Voeg \"source=...\" toe aan elementen?" @@ -12279,5 +12915,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Locatie" @@ -12474,5 +13110,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Geen gegevens geladen." @@ -12494,9 +13130,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12885,7 +13521,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "water" @@ -13045,19 +13681,19 @@ msgstr "Kan afbeelding niet ophalen" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Verbinden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Verbonden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Niet verbonden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Verbinding is mislukt" @@ -13096,32 +13732,32 @@ msgstr "LiveGPS-laag" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "GPS-track omvatten" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Eenmalig centreren" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "De LiveGPS-laag op de huidige locatie centreren." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Automatisch centeren" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "De LiveGPS-laag continu op de huidige locatie centeren." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13172,9 +13808,9 @@ msgstr "Kan niet buiten de wereld tekenen." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "Meetmodus" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Metingen" @@ -13212,5 +13848,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13221,13 +13857,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13376,5 +14012,5 @@ msgstr "Firefox-executable" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13470,5 +14106,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13544,41 +14180,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Slippy-kaart" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Tegel laden" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Alle tegels laden" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Zoom vergroten" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Zoom verkleinen" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13747,4 +14383,43 @@ msgstr "U dient eerst bronnen van tagvoorkeuzen in Voorkeuren op te geven." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Even" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Straten" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Puntnummer" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13763,42 +14438,20 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Rijtjeshuis maken" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Maak losse gebouwen uit een langgerekt gebouw." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Terras" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Straatnaam" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13813,5 +14466,5 @@ msgstr "Geen validatiefouten" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Raster" @@ -14476,38 +15129,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "gebouw" @@ -14521,5 +15144,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "gebied" @@ -14638,10 +15261,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15348,6 +15971,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Referentie" @@ -15793,5 +16416,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Breedte (meters)" @@ -15909,5 +16532,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15919,5 +16542,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "oerbos" @@ -16175,4 +16798,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16204,8 +16830,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "ja" @@ -16353,9 +16981,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "nee" @@ -16600,5 +17229,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "woongebied" @@ -16633,5 +17262,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "toegangsweg" @@ -16665,6 +17294,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "werkzaamheden" @@ -16714,5 +17343,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "rotonde" @@ -16900,6 +17529,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Wandelen" @@ -17020,5 +17649,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17044,4 +17672,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17051,15 +17680,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Bedrijf" @@ -17271,7 +17900,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Stijging" @@ -17690,5 +18319,5 @@ msgstr "veen" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17698,5 +18327,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "moeras" @@ -18222,32 +18851,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Openingstijden" @@ -18306,91 +18935,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18405,5 +19034,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18422,7 +19051,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Referentienummer" @@ -18438,5 +19067,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "ondergronds" @@ -18449,6 +19078,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Parkeergeld" @@ -18487,22 +19116,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Winkel" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Winkel met autoonderdelen bewerken" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Garage" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Autogarage bewerken" @@ -18510,5 +19127,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Verhuur" @@ -18517,10 +19134,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Autoverhuur bewerken" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Autodelen" @@ -18528,5 +19145,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Autodelen bewerken" @@ -18534,10 +19151,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Fietsenstalling bewerken" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Capaciteit" @@ -18546,22 +19163,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Fietsenverhuur bewerken" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Fietswinkel bewerken" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Openbaar vervoer" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18571,5 +19181,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18577,5 +19187,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-referentie" @@ -18583,5 +19193,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Onbemand station" @@ -18589,5 +19199,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Onbemand station bewerken" @@ -18595,5 +19205,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Tramhalte" @@ -18602,5 +19212,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Tramhalte bewerken" @@ -18608,5 +19218,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Perron" @@ -18615,5 +19225,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Perron bewerken" @@ -18625,5 +19235,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Referentie (tracknummer)" @@ -18631,10 +19241,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Gebied" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Metroingang" @@ -18643,10 +19253,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Metroingang bewerken" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Rolstoel" @@ -18655,5 +19265,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Busstation" @@ -18662,5 +19272,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Busstation bewerken" @@ -18668,5 +19278,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Bushalte" @@ -18676,5 +19286,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Bushalte bewerken" @@ -18683,17 +19293,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Schuilplaats" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Bank" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Busstation" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Busplatform bewerken" @@ -18701,5 +19319,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -18707,5 +19325,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Taxistandplaats bewerken" @@ -18713,5 +19331,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Luchthaven" @@ -18719,15 +19337,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18735,10 +19353,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Accomodatie" @@ -18750,5 +19368,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -18757,15 +19375,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Hotel bewerken" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Sterren" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motel" @@ -18773,20 +19391,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Motel bewerken" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Pension" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Pension bewerken" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Chalet" @@ -18794,10 +19412,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Chalet bewerken" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Hostel" @@ -18805,30 +19423,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Hostel bewerken" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Berghut" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Berghut bewerken" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Caravanpark" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Caravanpark bewerken" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Kampeerterrein" @@ -18836,10 +19454,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Kampeerterrein bewerken" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Eten en drinken" @@ -18850,5 +19468,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -18856,5 +19474,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Restaurant bewerken" @@ -18862,5 +19480,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Keuken" @@ -18868,61 +19486,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "Italiaanse keuken" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "Chinese keuken" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "Grieks" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "Duits" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "Indiaas" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "lokaal" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "Kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "Turks" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "Oosters" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "Thais" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "Mexicaans" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "Japans" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Fast Food" @@ -18930,9 +19548,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Fast-Food-restaurant bewerken" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Café" @@ -18940,9 +19558,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Café bewerken" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Kroeg" @@ -18950,18 +19568,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Kroeg bewerken" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Biergarten bewerken" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "" @@ -18969,9 +19587,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Nachtclub" @@ -18979,24 +19597,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Nachtclub bewerken" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Toerisme" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Attractie" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Attractie bewerken" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museum" @@ -19004,9 +19622,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Museum bewerken" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Dierentuin" @@ -19015,9 +19633,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Dierentuin bewerken" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Uitkijkpunt" @@ -19025,24 +19643,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Uitkijkpunt bewerken" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Uitkijktoren" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Themapark" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Themapart bewerken" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Kunstwerk" @@ -19050,5 +19668,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Kunstwerk bewerken" @@ -19056,19 +19674,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Kaart" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -19106,5 +19724,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19112,28 +19730,28 @@ msgstr "straat" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -19143,5 +19761,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -19149,6 +19767,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Fietsen" @@ -19156,5 +19774,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19162,6 +19780,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Skiën" @@ -19169,5 +19787,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19175,46 +19793,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "geschiedenis" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "natuur" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "Wild" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19222,29 +19840,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "Schuilplaats bewerken" @@ -19252,25 +19870,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Vuurplaats" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Picnicplek" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Picnicplek bewerken" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Historische locaties" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Kasteel" @@ -19279,19 +19897,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Kasteel bewerken" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruïne" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Ruïne bewerken" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Archeologische plaats" @@ -19300,9 +19918,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Archeologische plaats bewerken" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Slagveld" @@ -19310,10 +19928,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Slagveld bewerken" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19321,5 +19939,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19327,15 +19945,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monument" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Monument bewerken" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Herdenkingsplek" @@ -19343,55 +19961,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Herdenkingsplek bewerken" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Kruis langs de weg" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Kruis langs de weg bewerken" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Kapelletje langs de weg" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Kapelletje bewerken" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Vrije tijd" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Zwembad" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Zwembad bewerken" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Speelveld" @@ -19399,35 +20017,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Speelveld bewerken" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Visstek" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Visstek bewerken" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Sportfaciliteiten" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Stadion bewerken" @@ -19441,6 +20059,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "sport selecteren:" @@ -19832,30 +20450,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "sport" @@ -19865,225 +20483,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "Meervoudig" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "Boogschieten" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "Atletiek" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "Australisch football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "Honkbal" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "Basketball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "Boules" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "Bowling" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "Kanoën" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "Klimmen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "Cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "Cricket netten" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "Croquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "Fietsen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "Hondenraces" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "Paardensport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "Football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "Golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "Turnen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "Hockey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "Paardenraces" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "Motorsport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "Pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "Badminton" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "Rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "Schieten" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "Skateboarden" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "Schaatsen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "Skiën" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "Voetbal" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "Zwemmen" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "Tafeltennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "Tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Sportcentrum" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Sportcentrum bewerken" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Sportveld" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Sportveld bewerken" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Wedstrijdbaan" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Wedstrijdbaan bewerken" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfbaan" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Golfbaan bewerken" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Minigolf bewerken" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Verzameling" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Verzameling bewerken" @@ -20122,21 +20740,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "soort" @@ -20175,203 +20793,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "Sportveld" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "Sportcentrum" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "Stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Atletiek" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Atletiek bewerken" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Boogschieten" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Boogschieten bewerken" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Klimmen" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Klimmen bewerken" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Kanoën" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Kanoën bewerken" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Fietsen bewerken" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Hondenracen" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Hondenracen bewerken" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Paardenracen" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Paardenracen bewerken" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Turnen" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Turnen bewerken" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Motorracen" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Motorracen bewerken" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Schaatsen" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Schaatsen bewerken" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Skateboard bewerken" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Zwemmen" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Zwemmen bewerken" @@ -20379,56 +20997,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Skiën bewerken" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Soort piste" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "bergafwaarts" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "Scandinavisch" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Moeilijkheidsgraad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "beginner" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "eenvoudig" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "expert" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Schieten" @@ -20436,182 +21054,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Schieten bewerken" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Balsporten" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Voetbal" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Voetbal bewerken" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Football" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Football bewerken" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Australisch football" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Australisch football bewerken" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Honkbal" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Honkbal bewerken" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Basketball bewerken" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Golf bewerken" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golfbaan" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Boule bewerken" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Bowlen" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Bowlen bewerken" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Cricket bewerken" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Cricketnetten" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Cricketnetten bewerken" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Croquet bewerken" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Hockey bewerken" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Pelota bewerken" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Badminton" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Badminton bewerken" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Rugby bewerken" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Tafeltennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Tafeltennis bewerken" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Tennis bewerken" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Gebouwen" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Gebouw" @@ -20619,5 +21237,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Openbare gebouw" @@ -20625,10 +21243,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Openbare gebouwen bewerken" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Stadhuis" @@ -20636,10 +21254,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Stadhuis bewerken" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Ambassade" @@ -20647,10 +21265,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Ambassade bewerken" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Gerechtsgebouw" @@ -20659,10 +21277,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Gerechtsgebouw bewerken" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Gevangenis" @@ -20671,10 +21289,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Gevangenis bewerken" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Politie" @@ -20684,10 +21302,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Politie bewerken" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Brandweerkazerne" @@ -20696,10 +21314,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Brandweerkazerne bewerken" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Postkantoor" @@ -20707,5 +21325,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Postkantoor bewerken" @@ -20713,15 +21331,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Kinderopvang" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Kinderopvang bewerken" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "School" @@ -20729,10 +21347,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "School bewerken" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Universiteit" @@ -20740,10 +21358,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Universiteit bewerken" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Campus" @@ -20751,5 +21369,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Campus bewerken" @@ -20757,5 +21375,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Bioscoop" @@ -20764,10 +21382,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Bioscoop bewerken" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Bibliotheek" @@ -20776,9 +21394,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Bibliotheek bewerken" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Kunstcentrum" @@ -20786,10 +21404,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Kunstcentrum bewerken" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Theater" @@ -20798,10 +21416,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Theater bewerken" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Religieus gebouw" @@ -20811,5 +21429,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Religieus gebouw bewerken" @@ -20818,6 +21436,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religie" @@ -20826,66 +21444,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "Bahai" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "Boeddhisme" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "Christelijk" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "Hindoestaans" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "Jain" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "Joods" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "Moslim" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "Sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "Spirtualist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "Taoist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Benaming" @@ -20894,81 +21512,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "Anglicaan" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "Baptist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "Katholiek" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "Evangelist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "Jehovahs getuigen" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "Luthers" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "Methodist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "Mormoon" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "Orthodox" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "Protestant" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "Quaker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adressen" @@ -20977,5 +21595,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Adresinformatie bewerken" @@ -20983,5 +21601,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Huisnummer" @@ -20989,20 +21607,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Huisnaam" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Straatnaam" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Stadsnaam" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Postcode" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Landcode" @@ -21011,5 +21634,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Adresinterpolatie bewerken" @@ -21017,61 +21640,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Nummeringschema" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "oneven" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "even" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Bouwwerken" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Fabriek" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Fabriek bewerken" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Toren" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Toren bewerken" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -21079,25 +21702,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Watertoren" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Watertoren bewerken" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Olieopslag" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Olieopslag bewerken" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Vuurtoren" @@ -21105,10 +21728,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Vuurtoren bewerken" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Windmolen" @@ -21116,10 +21739,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Windmolen bewerken" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Pijplijn" @@ -21128,37 +21751,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Pijplijn bewerken" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Afvalzuivering" @@ -21168,10 +21791,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Afvalzuivering bewerken" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Kraan" @@ -21179,10 +21802,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Kraan bewerken" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Baken" @@ -21190,10 +21813,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Baken bewerken" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Uitkijkpunt" @@ -21201,10 +21824,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Uitkijkpunt bewerken" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Bewakingscamera" @@ -21212,5 +21835,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Bewakingscamera bewerken" @@ -21218,5 +21841,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Energievoorziening" @@ -21226,35 +21849,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Energievoorziening bewerken" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "water" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fossiele brandstoffen" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "nucleair" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "kolen" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "fotovoltage" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Verdeelstation" @@ -21263,10 +21886,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Verdeelstation bewerken" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -21275,5 +21898,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Transformatorstation bewerken" @@ -21281,10 +21904,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Lijnreferentie" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Hoogspanningsmast" @@ -21295,23 +21918,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Hoogspanningsmast bewerken" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Hoogspanningskabel" @@ -21320,75 +21943,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Hoogspanningskabels bewerken" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Voltage" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Voorzieningen" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Toiletten" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Opmerking" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Postbus" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefoon" @@ -21397,5 +22020,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Een telefoon bewerken" @@ -21403,5 +22026,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Munten" @@ -21409,5 +22032,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Briefgeld" @@ -21415,5 +22038,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Chipknip" @@ -21421,5 +22044,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Pinpas" @@ -21427,15 +22050,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Creditkaart" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefoonkaart" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Recycling" @@ -21444,5 +22067,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Recyclebakken" @@ -21450,68 +22073,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batterijen" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Flessen" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Kleding" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Schroot" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Bank" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21582,39 +22200,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "groen" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Vogeluitkijkpost" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Vogeluitkijkpost bewerken" @@ -21623,30 +22241,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Hoogte" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "Kruiphoogte" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "Bukhoogte" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "Stahoogte" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Verborgen" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Afgesloten" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fontein" @@ -21655,10 +22273,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Fontein bewerken" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Drinkwater" @@ -21667,10 +22285,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Drinkwater bewerken" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21678,33 +22296,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Winkels" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Winkel met autoonderdelen bewerken" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Fietswinkel bewerken" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarkt" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Supermarkt bewerken" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "" @@ -21712,9 +22354,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosk" @@ -21722,27 +22364,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Kiosk bewerken" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Verkoopautomaat" @@ -21750,5 +22392,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Verkoopautomaat bewerken" @@ -21756,88 +22398,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Producten" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "vervoerskaarten" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "overzichtskaart" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "parkeerbiljet" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "voedsel" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "frisdranken" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "snoepgoed" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "sigaretten" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "foto's" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "diervoeder" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "kranten" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "speelgoed" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "postzegels" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-kaarten" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "prepaid-kaarten" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "tegoedbonnen" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "condooms" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "hondenpoepzakjes" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Klantenkaarten" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Slager" @@ -21845,9 +22487,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Slager bewerken" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Bakker" @@ -21855,9 +22497,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Bakker bewerken" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Bloemist" @@ -21865,18 +22507,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Bloemist bewerken" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21884,54 +22526,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Dranken" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Computerwinkel bewerken" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Elektronica" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Elektronicawinkel bewerken" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Hifi-winkel bewerken" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Meubels" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Meubelzaak bewerken" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Tuincentrum" @@ -21939,9 +22581,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Tuincentrum bewerken" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21949,9 +22591,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Doe-het-zelfzaak" @@ -21959,54 +22601,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Doe-het-zelfzaak bewerken" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Kantoorartikelen" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Kantoorartikelenwinkel bewerken" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Kapper" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Kapper bewerken" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Schoenen" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Schoenenwinkel bewerken" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Speelgoed" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Speelgoedwinkel bewerken" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Videotheek" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Videotheek bewerken" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Stomerij" @@ -22014,9 +22656,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Stomerij bewerken" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Wasserette" @@ -22024,9 +22666,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Wasserette bewerken" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Buitensport" @@ -22034,28 +22676,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Buitensportzaak bewerken" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Sportzaak bewerken" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Opticiën bewerken" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Geldzaken" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Bank" @@ -22063,14 +22705,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Bank bewerken" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Geldautomaat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Geldwisselkantoor" @@ -22078,5 +22720,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Geldwisselkantoor bewerken" @@ -22084,15 +22726,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Geldautomaat bewerken" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Gezondheid" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Huisarts" @@ -22100,18 +22742,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Huisarts bewerken" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Tandarts" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Tandarts bewerken" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Apotheek" @@ -22119,5 +22761,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Apotheek bewerken" @@ -22125,9 +22767,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Ziekenhuis" @@ -22135,10 +22777,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Ziekenhuis bewerken" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "EHBO-post" @@ -22147,5 +22789,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "EHBO-post bewerken" @@ -22154,20 +22796,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Puntnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Telefoonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)" @@ -22175,5 +22817,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Dierenarts" @@ -22182,64 +22824,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Dierenarts bewerken" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Locaties" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Continent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Een continent bewerken" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Land bewerken" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Provincie" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Provincie bewerken" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Regio" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Regio bewerken" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "" @@ -22247,15 +22889,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Stad" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Stad bewerken" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Dorp" @@ -22263,10 +22905,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Dorp bewerken" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Deelgemeente" @@ -22274,25 +22916,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Deelgemeente bewerken" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Klein dorp" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Klein dorp bewerken" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Gehucht" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Gehucht bewerken" @@ -22300,5 +22942,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "" @@ -22306,10 +22948,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Eiland" @@ -22317,10 +22959,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Eiland bewerken" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22328,5 +22970,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22334,5 +22976,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Grotingang" @@ -22340,10 +22982,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Grotingang bewerken" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Bergtop" @@ -22351,10 +22993,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Bergtop bewerken" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Gletsjer" @@ -22362,10 +23004,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Gletsjer bewerken" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Vulkaan" @@ -22373,70 +23015,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Vulkaan bewerken" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Grenzen" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Landsgrens" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Landsgrens bewerken" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Provincie -of gemeentegrens" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Provincie -of gemeentegrens bewerken" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Grens bebouwde kom" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Grens bebouwde kom bewerken" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Grens kiesdistrict bewerken" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Grens Nationaal park bewerken" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Grondgebruik" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Boom" @@ -22445,15 +23087,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Boom bewerken" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botanische naam" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Bos" @@ -22462,5 +23104,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Bos bewerken" @@ -22468,17 +23110,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "naaldbomen" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "loofbomen" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "gemengd" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Bosbouw" @@ -22487,14 +23129,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Bosbouw bewerken" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Natuurreservaat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Natuurreservaat bewerken" @@ -22502,25 +23144,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Puinhelling" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Puinhelling bewerken" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Kreupelhout" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Kreupelhout bewerken" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22528,10 +23170,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Heide" @@ -22539,5 +23181,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Heide bewerken" @@ -22545,5 +23187,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Boerenerf" @@ -22552,45 +23194,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Boerenerf bewerken" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Landbouwgrond" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Landbouwgrond bewerken" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Weide" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Weideland bewerken" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Wijngaard" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Wijngaard bewerken" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Volkstuinen" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Volkstuinen bewerken" @@ -22598,25 +23240,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Tuin" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Tuin bewerken" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Gras" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Gras bewerken" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Stadsgroen" @@ -22624,10 +23266,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Stadsgroen bewerken" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Algemeen" @@ -22635,20 +23277,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Algemeen bewerken" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Park bewerken" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Recreatiegebied" @@ -22656,5 +23298,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Recreatiegebied bewerken" @@ -22662,15 +23304,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Woongebied" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Woongebied bewerken" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Begraafplaats" @@ -22678,9 +23320,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Begraafplaats bewerken" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Begraafplaats" @@ -22688,39 +23330,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Begraafplaats bewerken" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Winkelcentrum" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Winkelcentrum bewerken" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Kantoren" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Kantoren bewerken" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Industrieterrein" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Industrieterrein bewerken" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "" @@ -22728,15 +23370,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militair terrein" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Militair terrein bewerken" @@ -22744,55 +23386,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Bouwterrein" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Bouwterrein bewerken" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Braakliggende grond" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Braakliggende grond bewerken" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Ontwikkelingsgebied" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Ontwikkelingsgebied bewerken" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Vuilstortplaats" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Vuilstortplaats bewerken" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Mijnbouw" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Mijnbouw bewerken" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multipolygoon" @@ -22802,5 +23444,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Multipolygoon bewerken" @@ -22809,10 +23451,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "buitensegment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "binnensegment" @@ -22820,5 +23462,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Verkeersbeperking" @@ -22827,5 +23469,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Verkeersbeperking bewerken" @@ -22833,34 +23475,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Beperking" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "niet linksaf" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "niet rechtsaf" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "niet rechtdoor" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "niet keren" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "alleen rechtsaf" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "alleen linksaf" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "alleen rechtdoor" @@ -22869,15 +23511,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "vanaf weg" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "via knoop of weg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "naar weg" @@ -22885,5 +23527,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22892,5 +23534,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22898,5 +23540,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22968,24 +23610,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "fiets" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "straat" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "veerboot" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -23038,5 +23680,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23045,13 +23687,13 @@ msgstr "voet" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "omweg" @@ -23065,10 +23707,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -23076,31 +23718,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Netwerk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "voorgesteld" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "alternatief" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "tijdelijk" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "verbinding" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Kleur (hex)" @@ -23109,30 +23751,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23343,130 +23985,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23483,98 +23999,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "vervallen" @@ -23951,7 +24376,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "snelwegroute" @@ -24015,13 +24440,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "spoor" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24037,5 +24541,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -24049,5 +24553,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -24068,5 +24572,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "Omkeermogelijkheid" @@ -24081,5 +24585,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -24094,5 +24598,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "rivierbank" @@ -24106,5 +24610,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "stroom" @@ -24118,5 +24622,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "dok" @@ -24138,16 +24642,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "aquaduct" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24244,4 +24736,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24310,13 +24809,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "kunstmatig" @@ -24362,6 +24861,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24378,7 +24877,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "spoorwegpunt" @@ -24401,10 +24900,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "ander spoor" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "spoorovergang" @@ -24440,11 +24939,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "oud spoor" #. color rail +#. #. 1 #. 50000 @@ -24485,6 +24985,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "luchtverbinding" @@ -24498,5 +24998,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -24518,5 +25018,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "luchtverbinding_donker" @@ -24530,5 +25030,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "luchtverbinding_licht" @@ -24536,4 +25036,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24583,7 +25090,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "kabelbaan" @@ -24600,5 +25107,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "piste_eenvoudig" @@ -24613,5 +25120,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "piste_middelmatig" @@ -24626,5 +25133,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "piste_gevorderden" @@ -24639,5 +25146,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24652,5 +25159,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "piste_vrijekuur" @@ -24665,5 +25172,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "piste_beginner" @@ -24783,11 +25290,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "kracht" @@ -24801,5 +25308,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "pijler" @@ -24813,5 +25320,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "pijplijn" @@ -24939,12 +25446,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "vrije tijd" @@ -24958,5 +25482,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "jachthaven" @@ -24994,4 +25518,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25010,4 +25550,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25028,8 +25576,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "voorziening" @@ -25131,10 +25681,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "voorziening_verkeer" @@ -25388,5 +25938,5 @@ #. #. -#. +#. #. color health #. @@ -25532,4 +26082,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25549,23 +26107,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "voorziening_licht" @@ -25597,6 +26155,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "licht_water" @@ -25657,14 +26215,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "gezondheid" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26011,5 +26569,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26032,5 +26589,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "winkel" @@ -26102,8 +26660,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotel" @@ -26204,9 +26762,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "toerisme" @@ -26294,9 +26852,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "historisch" @@ -26310,5 +26868,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "mijnbouw" @@ -26322,5 +26880,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "vuilstortplaats" @@ -26342,5 +26900,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "estuarium" @@ -26354,5 +26912,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "bosbouw" @@ -26366,5 +26924,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "landbouwgrond" @@ -26387,5 +26945,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "winkelcentrum" @@ -26399,5 +26957,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "industrieel" @@ -26411,5 +26969,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "braakliggend gebied" @@ -26423,5 +26981,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "ontwikkelingsgebied" @@ -26435,5 +26993,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "Rangeerterrein" @@ -26490,7 +27048,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "militair gebruik" @@ -26504,5 +27062,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "begraafplaats" @@ -26515,5 +27073,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "berg of -heuveltop" @@ -26528,5 +27086,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "gletsjer" @@ -26540,5 +27098,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "vulkaan" @@ -26593,8 +27151,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "Natuurlijk" @@ -26608,5 +27166,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "ruig land" @@ -26620,5 +27178,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "heide" @@ -26632,7 +27190,7 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" -msgstr "" +msgstr "houtland" #. color water @@ -26644,5 +27202,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "slikgronden" @@ -26656,5 +27214,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "strand" @@ -26732,8 +27290,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "route" @@ -26781,7 +27339,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "grens" @@ -26931,11 +27489,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "plaats" @@ -26983,6 +27541,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adres" @@ -27331,97 +27889,128 @@ #: build/trans_wms.java:46 msgid "Lodi - Italy" -msgstr "" +msgstr "Lodi - Italië" #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& #: build/trans_wms.java:47 msgid "Sicily - Italy" -msgstr "" - -#~ msgid "Images for {0}" -#~ msgstr "Afbeeldingen van {0}" - -#~ msgid "Read GPX..." -#~ msgstr "GPX inlezen..." +msgstr "Sicilië - Italië" + +#~ msgid "Updating primitive" +#~ msgstr "Aanpassen primitief" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Sluithaak verwacht." + +#~ msgid "" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" +#~ msgstr "" +#~ "Het aantal wijzigingen overschrijdt het maximum, huidig is {0}, maximum " +#~ "is {1}" + +#~ msgid "" +#~ "I can take a picture of my GPS receiver.
Can this help?" +#~ msgstr "" +#~ "Ik kan een foto van mijn GPS-ontvanger maken.
Zou dat helpen?" + +#~ msgid "All images" +#~ msgstr "Alle afbeeldingen" + +#~ msgid "Images with no exif position" +#~ msgstr "Afbeelding zonder EXIF-locatie" + +#~ msgid "Not yet tagged images" +#~ msgstr "Nog niet getagde afbeeldingen" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "{0} overeenkomsten van {1} gevonden in GPX-track {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPX-track geladen" + +#~ msgid "Default Values" +#~ msgstr "Standaardwaarden" + +#~ msgid "Enable proxy server" +#~ msgstr "Proxyserver inschakelen" + +#~ msgid "Anonymous" +#~ msgstr "Anoniem" + +#~ msgid "Proxy server host" +#~ msgstr "Proxyserverhost" + +#~ msgid "Proxy server port" +#~ msgstr "Proxyserverpoort" + +#~ msgid "Proxy server username" +#~ msgstr "Gebruikersnaam proxyserver" + +#~ msgid "Proxy server password" +#~ msgstr "Wachtwoord proxyserver" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointer-uitzondering, mogelijk ontbreken er tags." + +#~ msgid "Preparing..." +#~ msgstr "Voorbereiden…" + +#~ msgid "Uploading..." +#~ msgstr "Uploaden..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Verkeerd wachtwoord of gebruikersnaam." + +#~ msgid "Enter Password" +#~ msgstr "Voer wachtwoord in" + +#~ msgid "Login" +#~ msgstr "Login" + +#~ msgid "Auto-tag source added:" +#~ msgstr "Bron auto-tag toegevoegd:" + +#~ msgid "Shop" +#~ msgstr "Winkel" + +#~ msgid "aqueduct" +#~ msgstr "aquaduct" + +#~ msgid "Select a bookmark first." +#~ msgstr "Selecteer eerst een bladwijzer." + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Geen afbeeldingen met een leesbare tijd gevonden." + +#~ msgid "Unknown version" +#~ msgstr "Onbekende versie" + +#~ msgid "position" +#~ msgstr "positie" + +#~ msgid "different" +#~ msgstr "verschillend" + +#~ msgid "true" +#~ msgstr "Waar" + +#~ msgid "Move" +#~ msgstr "Verplaatsen" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Conflicten oplossen" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen." + +#~ msgid "Image" +#~ msgstr "Afbeelding" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)" #~ msgid "No time for point {0} x {1}" #~ msgstr "Geen tijd voor punt {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen." - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Geen afbeeldingen met een leesbare tijd gevonden." - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS-start: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS-einde: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "Huidige verschil: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "Tijdzoneverschil: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} binnen de track." - -#~ msgid "Sync clock" -#~ msgstr "Klok synchroniseren" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"." - -#~ msgid "Image" -#~ msgstr "Afbeelding" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Syncroniseer tijd met GPS-apparaat" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Ingevoerde tijd kon niet worden ontleed." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Geotagged-afbeeldingen" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Afbeeldingen openen met AGPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "osmarender-optie" - -#~ msgid "Select a bookmark first." -#~ msgstr "Selecteer eerst een bladwijzer." - -#~ msgid "Unknown version" -#~ msgstr "Onbekende versie" - -#~ msgid "position" -#~ msgstr "positie" - -#~ msgid "different" -#~ msgstr "verschillend" - -#~ msgid "true" -#~ msgstr "Waar" - -#~ msgid "Move" -#~ msgstr "Verplaatsen" - -#~ msgid "File could not be found." -#~ msgstr "Bestand kon niet gevonden worden." - -#~ msgid "Resolve Conflicts" -#~ msgstr "Conflicten oplossen" #~ msgid "Error while parsing" @@ -27541,4 +28130,13 @@ #~ msgid "name" #~ msgstr "naam" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)" + +#~ msgid "Images for {0}" +#~ msgstr "Afbeeldingen van {0}" + +#~ msgid "Read GPX..." +#~ msgstr "GPX inlezen..." #~ msgid "Add either site-josm.xml or Wiki Pages." @@ -27631,4 +28229,7 @@ #~ msgstr "Samenvoegconflicten." +#~ msgid "osmarender options" +#~ msgstr "osmarender-optie" + #~ msgid "error loading metadata" #~ msgstr "laden van metadata is mislukt" @@ -27642,4 +28243,7 @@ #~ msgid "error requesting update" #~ msgstr "update aanvragen is mislukt" + +#~ msgid "{0} within the track." +#~ msgstr "{0} binnen de track." #~ msgid "Import TCX file as GPS track" @@ -27731,4 +28335,10 @@ #~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?" +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotagged-afbeeldingen" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Afbeeldingen openen met AGPifoJ..." + #~ msgid "Please enter a search string" #~ msgstr "Voer een zoekstring in" @@ -27873,4 +28483,28 @@ #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "Je kunt met de muis of CTRL+pijltoetsen zoomen en verplaatsen." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS-start: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS-einde: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "Huidige verschil: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "Tijdzoneverschil: " + +#~ msgid "Sync clock" +#~ msgstr "Klok synchroniseren" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"." + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Ingevoerde tijd kon niet worden ontleed." #~ msgid "Login name (email) to the OSM account." @@ -27958,4 +28592,7 @@ #~ "je werk op en start een nieuwe laag in de\n" #~ "nieuwe zone." + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Syncroniseer tijd met GPS-apparaat" #~ msgid "Selected makes your trace public in openstreetmap.org" Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 19198) +++ /applications/editors/josm/i18n/po/pl.po (revision 19199) @@ -4,11 +4,12 @@ # MARCIN FLORYAN , 2008. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-12-03 11:07+0000\n" -"Last-Translator: Piotr Strębski \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-21 18:27+0000\n" +"Last-Translator: Yarl \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -17,5 +18,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: 2009-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -23,35 +24,35 @@ "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Przygotowywanie interfejsu użytkownika" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Pomoc" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Pominięto niepoprawny URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -63,21 +64,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -98,17 +99,8 @@ msgstr "Uwaga" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Pominięto niepoprawny URL do pliku: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Nie można odczytać pliku ''{0}''.
Błąd:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -116,8 +108,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Nie można odczytać pliku ''{0}''.
Błąd:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,10 +126,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -140,9 +141,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -151,6 +153,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -205,8 +207,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -274,5 +276,5 @@ msgstr "O JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -281,5 +283,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -288,5 +290,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -295,15 +297,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Kontynuuj" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -312,29 +319,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -351,5 +359,9 @@ msgstr "Anuluj" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Proszę wybrać conajmniej jeden węzeł, drogę lub relację" @@ -365,5 +377,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Połącz" @@ -383,15 +395,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Dodaj węzeł..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Dodaje węzeł po podaniu wysokości i szerokości geograficznej." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -407,22 +419,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Edycja: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Podaj współrzędne nowego węzła." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Użyj stopni dziesiętnych." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Wartości ujemne oznaczają zachodnią/południową półkulę." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -431,5 +443,5 @@ msgstr "Szerokość" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -438,28 +450,29 @@ msgstr "Długość" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -471,9 +484,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -494,18 +507,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -517,5 +530,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -537,6 +550,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -583,5 +596,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" @@ -618,14 +631,15 @@ msgstr "Brak konfliktów, które można pokazać" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +msgstr "Zamknij otwarte zestawy zmian" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +msgstr "Zamyka otwarte zestawy zmian" + +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -635,21 +649,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Plik: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Nie ma otwartych changesetów" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Brak otwartych changesetów" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Pobieram otwarte changesety ..." @@ -736,11 +750,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -820,16 +835,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -865,5 +885,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Powiel" @@ -906,10 +926,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Eksportuj do GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Eksportuj dane do pliku GPX" @@ -924,12 +944,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -954,8 +974,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -966,10 +986,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -982,17 +1002,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1029,22 +1049,27 @@ msgstr "Wyświetl informacje obiektowe o węźle, drodze lub relacji OSM." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Połącz nakładające się obszary" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Wybierz co najmniej dwie drogi do połączenia." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1054,38 +1079,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1093,33 +1114,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Podaj wartości dla wszystkich konfliktów." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Rozwiąż konflikty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1282,5 +1303,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Nie można przenieść zaznaczonych obiektów poza świat." @@ -1360,28 +1381,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Korekta prostopadłości" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Przesuwa węzły tak aby wszystkie kąty miały 90 lub 270 stopni" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1390,9 +1411,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1404,16 +1425,16 @@ "ostrzeżenie.
Kontynuujesz?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Korekta prostopadłości" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Użycie" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Korekta prostopadłości" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1486,18 +1507,18 @@ msgstr "Nie mogłem przemianować pliku ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Odwróć kierunek dróg" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Zmienia kierunek wszystkich zaznaczonych dróg na przeciwny." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Proszę zaznaczyć co najmniej jedną drogę." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Odwróć kierunek dróg" @@ -1506,10 +1527,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Zapisz" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Zapisuje bieżące dane." @@ -1566,10 +1587,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Zapisz jako..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Zapisuje bieżące dane do nowego pliku." @@ -1612,6 +1633,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1643,5 +1663,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1706,5 +1726,5 @@ "węzły w środku drogi.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1712,5 +1732,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1718,5 +1738,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1750,29 +1770,29 @@ msgstr "Ten węzeł nie jest przyklejony do niczego więcej." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Żaden z tych węzłów nie jest przyklejony do niczego więcej." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Żaden z węzłów tej drogi nie jest przyklejony do niczego więcej." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Wybierz przynajmniej:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Jeden węzęł z tagami lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Jeden węzeł który jest użyty przez więcej niż jedną drogę lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" @@ -1780,5 +1800,5 @@ "tych dróg lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1787,5 +1807,5 @@ "drogę, lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1794,5 +1814,5 @@ "niż jedną drogę." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1802,9 +1822,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Rozdzielenie węzła" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1812,5 +1832,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1845,10 +1865,10 @@ msgstr "Odznacz wszystko (anulowanie)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Aktualizuj dane" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1856,53 +1876,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Nie znaleziono aktualnego zestawu danych" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "Nie znalazłem obiektu o id {0} w zestawie danych." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Aktualizuj zaznaczenie" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Wybrano zbiór pusty." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Wysyłam dane" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1913,5 +1929,5 @@ "
Musisz je najpierw rozwiązać." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1919,131 +1935,7 @@ msgstr "Brak zmian do wysłania." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nie ma nic do wysłania. Wprowadź jakieś dane." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "Synchronizuję tylko węzeł {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "Synchronizuję tylko drogę {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Synchronizuję tylko relację {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synchronizuj cały zestaw danych" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Wykryto konflikty" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Zamknięto changeset" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "Kliknij aby przerwać i powrócić do edycji." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Odświeżam element" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2178,9 +2070,9 @@ msgstr "Pobrane dane GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Pobieranie danych" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2188,5 +2080,5 @@ msgstr "Zignorowałem wyjątek {0} ponieważ całe pobieranie zostało anulowane." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "Nie znaleziono żadnych danych w tym obszarze." @@ -2257,7 +2149,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2274,58 +2166,52 @@ "usuwaniu drogi. Ctrl: usuwa powiązane obiekty." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Rysowanie" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Tworzenie węzłów i dróg." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "zaznaczony" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Nie można dodać węzła poza granicami świata." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Dodaj węzeł" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Dodaj węzeł do drogi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Połącz istniejący drogę z węzłem" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Dodaj nowy węzeł do istniejącej drogi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Dodaj węzeł do drogi i połącz" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Utwórz nowy węzeł." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Zaznacz węzeł pod kursorem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2334,14 +2220,14 @@ msgstr[1] "Wstaw w drogę nowe węzły {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Zacznij nową drogę od ostatniego węzła" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Kontynuuj drogę od ostatniego węzła." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Zakończ rysowanie." @@ -2380,18 +2266,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Zaznacz" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Wybieranie, przesuwanie i obracanie obiektów" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2400,17 +2287,17 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Więcej elementów" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Przesuń je" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Cofnij przesunięcie" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2423,13 +2310,13 @@ "Czy na pewno je przesunąć?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Zawsze przesuwaj i nie pokazuj tego okna dialogowego" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2438,9 +2325,9 @@ "najbliższym węzłem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Zwolnij przycisk myszy aby zakończyć obracanie." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2450,5 +2337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Powiększ" @@ -2472,5 +2359,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Szukaj obiektów" @@ -2560,7 +2447,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - wszystkie obiekty zmienione przez użytkownika" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2569,8 +2455,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - obiekt z podaną liczbą węzłów" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:... - obiekt z podaną liczbą węzłów" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2578,45 +2474,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - wszystkie zmienione obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - wszystkie zaznaczone obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - wszystkie niekompletne obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - wszystkie obiekty bez tagów" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Użyj I lub OR by połączyć logicznym \"lub\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Użyj \" aby wpisać operator (np.: jeżeli klucz zawiera :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Użyj ( oraz ) aby pogrupować wyrażenia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2624,55 +2526,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Szukaj" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Rozpocznij szukanie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Nie znaleziono nic szukając ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Niczego nie usunięto z zaznaczenia szukając \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Znaleziono {0} pasujących." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2682,40 +2584,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Brak argumentów dla operator lub." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Brak argumentu dla operatora nie." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Brak nawiasu zamykającego." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Brak argumentów dla operator lub." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2724,9 +2629,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2735,7 +2640,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2769,39 +2679,29 @@ msgstr "Błąd podczas łączenia z serwerem." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Aktualna ilość zmian przekracza maksymalną możliwą ilość. Aktualna ilość " -"zmian to {0} z możliwych {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "{0} węzłów w drodze {1} przekracza dopuszczalną liczbę węzłów {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Naruszenie możliwości API" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "{0} węzłów w drodze {1} przekracza dopuszczalną liczbę węzłów {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2914,5 +2814,5 @@ msgstr "Ustaw {0}={1} dla {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2927,5 +2827,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -3026,4 +2926,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3135,5 +3050,5 @@ msgstr "Zastosować?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3217,15 +3132,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, 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:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3234,5 +3149,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3241,5 +3156,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3248,5 +3163,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3255,5 +3170,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3261,5 +3176,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3268,5 +3183,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3275,5 +3190,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3282,5 +3197,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3289,10 +3204,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3300,24 +3215,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Preferencje zostały zapisane na {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Wysłanie preferencji nie powiodło się. Powód: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Pobranie preferencji z serwera nie powiodło się." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3326,5 +3241,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3353,5 +3268,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3373,31 +3288,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "W" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3405,5 +3313,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3414,27 +3322,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3442,5 +3350,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3452,5 +3360,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3458,25 +3366,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3484,43 +3392,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Parametr \"{0}\" nie może być pusty (ang. null)" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3528,5 +3448,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3554,10 +3474,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3565,7 +3481,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3580,5 +3496,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3596,146 +3512,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Nieznana rola \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "nieotagowany" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "tekst" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Błąd: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Uwaga: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "nieaktywne" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "zaznaczony" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3745,6 +3653,6 @@ msgstr[2] "węzłów" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3754,7 +3662,8 @@ msgstr[2] "dróg" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3764,21 +3673,37 @@ msgstr[2] "relacji" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "nieotagowana droga" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "niekompletna droga" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "tło" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "wyróżnienie" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "nieotagowany" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "tekst" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3920,5 +3845,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "tory kolejowe" @@ -3934,7 +3859,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3952,4 +3877,10 @@ msgstr[2] "{0} elementów" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3981,6 +3912,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Konflikt" @@ -3994,7 +3925,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4073,74 +4004,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nazwa użytkownika" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Hasło" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "użycie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "opcje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Wyświetl tę pomoc" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Przywróć domyślne ustawienia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Ustaw język" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4149,9 +4080,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "przykłady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4159,36 +4090,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktywacja zaktualizowanych wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Ładowanie wczesnych wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Zapisywanie domyślnych ustawień" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Ładowanie wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Plik" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4203,22 +4134,22 @@ msgstr "Edycja" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Widok" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Narzędzia" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Szablony" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4226,5 +4157,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Dźwięk" @@ -4303,13 +4234,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "warstwa nie jest na liście." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4342,5 +4274,5 @@ msgstr "Inicjalizacja" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4348,6 +4280,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4356,5 +4288,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4363,5 +4295,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4370,25 +4302,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4396,9 +4328,9 @@ msgstr "Rola" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4430,11 +4362,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4443,6 +4375,6 @@ msgstr "Etykiety" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4450,6 +4382,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4457,40 +4389,40 @@ msgstr "Członkowie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4498,21 +4430,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4544,22 +4476,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4567,5 +4499,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4573,30 +4505,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4604,5 +4536,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4610,14 +4542,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4625,5 +4557,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4631,23 +4563,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4658,27 +4590,27 @@ msgstr "Usuń" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4687,5 +4619,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4694,5 +4626,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4701,5 +4633,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4708,5 +4640,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4715,5 +4647,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4723,5 +4655,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4956,10 +4888,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4969,10 +4901,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5057,9 +4989,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5067,6 +4999,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "wszystkie" @@ -5155,7 +5087,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5166,6 +5098,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5274,4 +5206,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Usuwa wybrane obiekty" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Zamknięto changeset" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Pobierz" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Pobiera dane mapy z serwera OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Zamyka otwarte zestawy zmian" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Otwiera okno edycji dla zaznaczonej relacji." + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5285,12 +5269,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5308,18 +5292,18 @@ msgstr "Historia poleceń: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Rozwiąż" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5327,25 +5311,25 @@ msgstr "Zaznacz na mapie elementy zaznaczone na powyższej liście." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5357,26 +5341,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5387,41 +5371,41 @@ msgstr "Dodaj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5460,5 +5444,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5473,34 +5457,34 @@ msgstr "Otwiera listę wszystkich wczytanych warstw." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Usuń zaznaczoną warstwę." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Pokaż/Ukryj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Zmienia widocznoś zaznaczonej warstwy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu." @@ -5510,5 +5494,176 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relacje" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Otwiera listę wszystkich relacji" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relacje: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Otwiera okno edycji dla zaznaczonej relacji." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Usuwa zaznaczoną relację." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Utwórz nową relację" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Bieżące zaznaczenie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Otwiera okno z listą zaznaczonych obiektów." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Powiększ do wybranych elementów" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Powiększ do zaznaczenia" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Zazn.: Rel.:{0} / Drogi:{1} / Węzły:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Zaznaczenie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Zaznaczenie: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Oderwij panel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Autorzy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Otwiera listę ludzi pracujących nad zaznaczonymi obiektami." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "Liczba obiektów" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "niekompletne" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "zamknięta droga" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Pobieram otwarte changesety ..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5517,22 +5672,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Zmienić wartości?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5542,5 +5697,5 @@ msgstr[2] "Zmiana właściwości {0} obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5550,227 +5705,71 @@ msgstr[2] "Ta operacja może zmienić {0} obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Proszę wybierz klucz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Proszę wybierz wartość" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Zaznacz proszę te obiekty, których właściwości chcesz zmienić." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Właściwości/członkostwo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Właściwości zaznaczonych obiektów." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Członek" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Dodaj właściwości" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Właściwości: {0} / członkostwo: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Właściwości / członkostwo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Zmień relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Usuń z relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Na pewno usunąć zaznaczenie z relacji {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Usuń wybrany klucz ze wszystkich obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Usuń właściwość" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relacje" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Otwiera listę wszystkich relacji" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relacje: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Otwiera okno edycji dla zaznaczonej relacji." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Usuwa zaznaczoną relację." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Utwórz nową relację" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Bieżące zaznaczenie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Otwiera okno z listą zaznaczonych obiektów." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Powiększ do wybranych elementów" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Powiększ do zaznaczenia" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Zazn.: Rel.:{0} / Drogi:{1} / Węzły:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Zaznaczenie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Zaznaczenie: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Oderwij panel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Autorzy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Otwiera listę ludzi pracujących nad zaznaczonymi obiektami." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Autor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "Liczba obiektów" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5832,15 +5831,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Pobierz wszystkie niekompletne drogi i węzły w relacji" -msgstr[1] "Pobierz wszystkie niekompletne drogi i węzły w relacji" -msgstr[2] "Pobierz wszystkie niekompletne drogi i węzły w relacji" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Pobierz dane." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5863,14 +5860,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Zastosuj szablon" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Otwiera okno edycji dla zaznaczonej relacji." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5879,14 +5874,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5896,9 +5891,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5908,15 +5903,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5924,5 +5919,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5930,20 +5925,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5952,70 +5947,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Sport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6024,9 +6018,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6035,48 +6029,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Pobierz członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6086,34 +6079,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6225,10 +6218,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6238,5 +6231,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6321,9 +6314,4 @@ msgid "Download Area" msgstr "Pobierany obszar" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Pobierz" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6624,6 +6612,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6636,6 +6622,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6906,4 +6890,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7126,5 +7114,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7167,116 +7155,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Nazwa" @@ -7300,15 +7288,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Rodzaj" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7479,10 +7467,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7490,5 +7478,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7496,9 +7484,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7613,6 +7601,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "nieznany" @@ -7634,13 +7622,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7675,4 +7663,116 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Synchronizuję tylko węzeł {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Synchronizuję tylko drogę {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Synchronizuję tylko relację {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synchronizuj cały zestaw danych" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Wykryto konflikty" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Zamknięto changeset" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "Kliknij aby przerwać i powrócić do edycji." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7691,39 +7791,147 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Wyślij zmiany" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Zamykanie zestawu zmian..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Zapisz nazwę użytkownika i hasło (nieszyfrowane)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Podaj nazwę użytkownika" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Uwaga: Hasło nie jest szyfrowane podczas transmisji." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "lekkoatletyka" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Zmień relację" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7790,17 +7998,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7813,9 +8021,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7829,9 +8037,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7846,50 +8054,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Porzuć i wyjdź" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7897,5 +8105,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7968,40 +8176,378 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Ustawienia" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "Advanced" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Konfiguracja dostępnych wtyczek." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Nieznana rola \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Wyślij zmiany" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "O programie" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Zamknięto changeset" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Proszę wybrać wiersz do usunięcia" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Obiekty do dodania:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Obiekty do zmiany:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Obiekty do usunięcia:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8010,5 +8556,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8017,5 +8563,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8024,209 +8570,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Wyślij zmiany" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Proszę wcześniej podać wybrane współrzędne." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} metrów" -msgstr[1] "{0} metrów" -msgstr[2] "{0} metrów" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Podaj nazwę użytkownika" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "punkt GPS" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Dostosuj rysowanie linii" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Użyj ustawień globalnych." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Rysuj linie pomiędzy punktami na tej warstwie." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Wybierz opcje rysowania linii" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8234,5 +8608,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8241,5 +8615,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8321,5 +8695,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Opis" @@ -8353,10 +8727,10 @@ msgstr[2] "{0} punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Przekształć w warstwę danych" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8366,12 +8740,12 @@ "za niebezpieczne.
Jeśli chcesz wysłać same ślady zajrzyj tu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8380,29 +8754,29 @@ msgstr "Przekonwertowany z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Pobierz dane OSM wzdłuż tej ścieżki" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Pobierz wszystko pomiędzy:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} metrów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Maksymalny obszar na zapytanie:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km kw." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8413,5 +8787,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -8419,5 +8793,5 @@ "danymi dźwiękowymi." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8425,5 +8799,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8431,23 +8805,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Warstwa danych {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "poza pobranym obszarem" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8456,5 +8830,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8468,5 +8842,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8479,11 +8853,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8492,36 +8866,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "Obiekty na warstwie {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8529,5 +8903,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8536,5 +8910,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8543,5 +8917,5 @@ msgstr[2] "punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8551,5 +8925,5 @@ msgstr[2] "trasa z {0} punktami" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8559,5 +8933,5 @@ msgstr[2] "{0} składa się z {1} ścieżek" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8567,24 +8941,24 @@ msgstr[2] "{0} punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Pliki GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Błąd podczas przetwarzania {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Nie można odczytać \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8593,34 +8967,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Brak daty" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Otwórz inne zdjęcie" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8630,69 +9004,155 @@ "Proszę użyć wybranego formatu." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Nieprawidłowa data" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "Scieżka GPX: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Aktualizuj pozycję dla: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Strefa czasowa: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Aktualizuj pozycję dla: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Wszystkie obrazy" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Nic nie wybrano!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Nieprawidłowa strefa czasowa" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8701,9 +9161,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Nieprawidłowa strefa czasowa" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8712,134 +9168,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Ślad GPX wczytany" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Pobieranie lokalizacji GPS z EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Wczytywanie {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Przeglądanie katalogu {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Geolokalizowane obrazy" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8848,52 +9226,100 @@ msgstr[2] "obrazów" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Zawsze przesuwaj i nie pokazuj tego okna dialogowego" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Plik nie został odnaleziony." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Brak obrazu" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Wczytywanie {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Błąd w pliku {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Geolokalizowane obrazy" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Poprzedni obrazek" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Przełącz: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Usuń zdjęcie z warstwy" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Usuń z relacji" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Następny obrazek" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Wyśrodkuj widok" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8904,5 +9330,5 @@ "Wysokość: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9002,4 +9428,12 @@ msgstr "Błąd podczas wyświetlania adresu" +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" @@ -9213,7 +9647,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "wszystkie" @@ -9282,6 +9715,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Rowery" @@ -9676,31 +10109,90 @@ msgstr "Projekcja {0} nie może zostać aktywowana. Używam Mercatora." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Używaj serwera proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonimowy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "hostel" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Port:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Hasło" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Ustawienia Proxy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Proxy - adres serwera" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Proxy - port serwera" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Proxy - nazwa użytkownika" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Proxy - hasło" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "Adres URL serwera OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Adres URL serwera" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "Hasło OSM" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9980,5 +10472,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9988,13 +10480,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10002,18 +10494,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Dodatkowe atrybuty:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "zamknięta droga" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Nieznany typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10024,16 +10516,16 @@ msgstr "Nie można odczytać źródła szablonów: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Błąd podczas przetwarzania {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementy typu {0} nie są wspierane." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10043,18 +10535,18 @@ msgstr[2] "Zmień {0} obiektów" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Nic nie wybrano!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Nieodpowiednie zaznaczenie." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Zastosuj szablon" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Zmień właściwości" @@ -10083,4 +10575,11 @@ msgstr "Pobieranie punktów od {0} do {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10096,13 +10595,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "" -"Wyjątek NullPointerException, prawdopodobnie brakuje jakichś znaczników." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Przygotowywanie danych..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10205,16 +10758,16 @@ msgstr "Błąd parsowania: błędna struktura dokumentu gpx" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10224,40 +10777,40 @@ msgstr "Pobieranie danych OSM..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10265,11 +10818,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Pobieranie punktów od {0} do {1}..." -msgstr[1] "Pobieranie punktów od {0} do {1}..." -msgstr[2] "Pobieranie punktów od {0} do {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10306,14 +10858,14 @@ msgstr "Import NMEA zakończony niepowodzeniem!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10322,16 +10874,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10339,66 +10891,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Zamykanie zestawu zmian..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Przygotowywanie..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Wysyłanie..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Przygotowywanie danych..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Zmień {0} obiekt" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10424,4 +10987,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10433,5 +11006,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10458,5 +11031,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10464,5 +11037,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10475,5 +11048,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10484,57 +11057,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Nieprawidłowe hasło lub nazwa użytkownika." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Uwaga: Hasło nie jest szyfrowane podczas transmisji." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Zapisz nazwę użytkownika i hasło (nieszyfrowane)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Wprowadź hasło" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Logowanie" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "Adres URL serwera OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Adres URL serwera" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "Hasło OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10624,5 +11146,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10631,38 +11160,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10670,19 +11199,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Niekompletny opis z ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Niedozwolony obiekt z id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10692,8 +11221,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10703,25 +11232,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10729,5 +11274,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10736,5 +11281,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10742,5 +11287,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10749,13 +11294,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Przygotowywanie danych OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10778,21 +11323,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Pobieram otwarte changesety ..." +msgstr[1] "Pobieram otwarte changesety ..." +msgstr[2] "Pobieram otwarte changesety ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Pobieram otwarte changesety ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10820,9 +11378,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10883,5 +11437,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10891,4 +11445,9 @@ msgid "Uploading data ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "usunięte, bądź przesunięte elementy" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10929,12 +11488,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Usuń {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Błąd podczas usuwania wtyczki: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11078,9 +11637,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "brak opisu" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11213,4 +11772,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11501,6 +12075,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Wyślij ślady" @@ -11586,5 +12160,5 @@ msgstr "Wysyłanie śladu GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Wysyła ślady do openstreetmap.org" @@ -11595,5 +12169,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Interpolacja adresów" @@ -11608,11 +12182,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11623,24 +12194,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Numer" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "węglowa" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "obraz" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "wypożyczalnia" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11658,7 +12225,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "wewnętrzny segment" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11771,5 +12337,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11831,21 +12397,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Kataster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11854,13 +12420,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11885,17 +12451,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11907,18 +12473,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "WMS katastru francuskiego" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11926,5 +12492,5 @@ msgstr "Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11932,52 +12498,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12179,5 +12742,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12368,5 +12931,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Nie wczytano żadnych danych." @@ -12388,9 +12951,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12776,7 +13339,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "woda" @@ -12925,19 +13488,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Łączenie" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Połączony" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Nie połączony" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Połączenie nie powiodło się" @@ -12976,32 +13539,32 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Wycentruj raz" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Centruj ciągle" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "" @@ -13052,9 +13615,9 @@ msgstr "Nie można rysować poza światem" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "tryb wymiarowania" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "" @@ -13092,5 +13655,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13101,13 +13664,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13254,5 +13817,5 @@ msgstr "Ścieżka do programu Firefox" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13344,5 +13907,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13418,41 +13981,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Mapa \"Slippy\"" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13621,4 +14184,42 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Najmniejszy numer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Największy numer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Sieć drogowa" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Największy numer" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13637,41 +14238,19 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Największy numer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Najmniejszy numer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolacja" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Nazwa ulicy" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" msgstr "" @@ -13687,5 +14266,5 @@ msgstr "Sprawdzanie poprawności przebiegło pomyślnie" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Siatka" @@ -14335,38 +14914,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "budynek" @@ -14380,5 +14929,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "obszar" @@ -14493,10 +15042,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15198,6 +15747,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Numer" @@ -15643,5 +16192,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Szerokość (w metrach)" @@ -15759,5 +16308,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15769,5 +16318,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "Las naturalny" @@ -16025,4 +16574,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16054,8 +16606,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "tak" @@ -16203,9 +16757,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "nie" @@ -16450,5 +17005,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "droga lokalna" @@ -16483,5 +17038,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "droga serwisowa" @@ -16515,6 +17070,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "w budowie" @@ -16564,5 +17119,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "rondo" @@ -16750,6 +17305,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "szlak" @@ -16870,5 +17425,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16894,4 +17448,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16901,15 +17456,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operator" @@ -17121,7 +17676,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Wysokość" @@ -17540,5 +18095,5 @@ msgstr "torfowisko" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17548,5 +18103,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "marsze" @@ -18072,32 +18627,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "godziny otwarcia" @@ -18156,91 +18711,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18255,5 +18810,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18272,7 +18827,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Numer referencyjny" @@ -18288,5 +18843,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "podziemny" @@ -18299,6 +18854,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Opłata" @@ -18337,22 +18892,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "warsztat" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Edycja warsztatu samochodowego" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "" @@ -18360,5 +18903,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "wypożyczalnia" @@ -18367,10 +18910,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Edycja wypożyczalni samochodów" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "" @@ -18378,5 +18921,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "" @@ -18384,10 +18927,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Edycja parkingu dla rowerów" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Pojemność" @@ -18396,22 +18939,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Edycja wypożyczalni rowerów" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Edycja warsztatu rowerowego" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Transport publiczny" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18421,5 +18957,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18427,5 +18963,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18433,5 +18969,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "przystanek kolejowy" @@ -18439,5 +18975,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Edycja przystanku kolejowego" @@ -18445,5 +18981,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "przystanek tramwajowy" @@ -18452,5 +18988,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Edycja przystanku tramwajowego" @@ -18458,5 +18994,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Platforma kolejowa" @@ -18465,5 +19001,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Edytuj platformę kolejową" @@ -18475,5 +19011,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Oznaczenie (numer toru)" @@ -18481,10 +19017,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "obszar" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "wejście do metra" @@ -18493,10 +19029,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Edycja wejścia do metra" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "dla niepełnosprawnych" @@ -18505,5 +19041,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "dworzec autobusowy" @@ -18512,5 +19048,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Edycja dworca autobusowego" @@ -18518,5 +19054,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Przystanek autobusowy" @@ -18526,5 +19062,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Edycja przystanku autobusowego" @@ -18533,17 +19069,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "schronienie" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "ławka" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "" @@ -18551,5 +19095,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "taksówki" @@ -18557,5 +19101,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Edycja postoju taksówek" @@ -18563,5 +19107,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "lotnisko" @@ -18569,15 +19113,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Edycja lotniska" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18585,10 +19129,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Zakwaterowanie" @@ -18600,5 +19144,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "hotel" @@ -18607,15 +19151,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Edycja hotelu" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Gwiazdki" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "motel" @@ -18623,20 +19167,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Edycja motelu" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "kwatera" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Edycja kwatery turystycznej" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "chata górska" @@ -18644,10 +19188,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Edycja chaty górskiej" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "hostel" @@ -18655,30 +19199,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Edycja hostelu" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "chata alpejska" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Edycja chaty alpejskiej" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "kemping" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Edycja kempingu" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "pole namiotowe" @@ -18686,10 +19230,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Edycja pola namiotowego" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Wyżywienie" @@ -18700,5 +19244,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "restauracja" @@ -18706,5 +19250,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Edycja restauracji" @@ -18712,5 +19256,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Kuchnia" @@ -18718,61 +19262,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "włoska" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "chińska" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamburgery" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "grecka" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "niemiecka" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indyjska" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "regionalna" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turecka" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "azjatycka" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "tajska" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "meksykańska" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japońska" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "fast food" @@ -18780,9 +19324,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Edycja restauracji fast-food" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "kawiarnia" @@ -18790,9 +19334,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Edycja kawiarni" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "pub" @@ -18800,18 +19344,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Edycja pubu" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "ogródek piwny" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Edycja ogródka piwnego" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "bar" @@ -18819,9 +19363,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Edycja baru" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "klub nocny" @@ -18829,24 +19373,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Edycja klubu nocnego" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turystyka" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "atrakcja" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Edycja atrakcji turystycznej" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "muzeum" @@ -18854,9 +19398,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Edycja muzeum" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "zoo" @@ -18865,9 +19409,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Edycja zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "punkt widokowy" @@ -18875,24 +19419,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Edycja punktu widokowego" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "wieża widokowa" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "park rozrywki" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Edycja parku rozrywki" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "sztuka" @@ -18900,5 +19444,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Edycja obiektu sztuki" @@ -18906,19 +19450,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Mapa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18956,5 +19500,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18962,28 +19506,28 @@ msgstr "ulica" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -18993,5 +19537,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18999,6 +19543,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "kolarstwo" @@ -19006,5 +19550,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19012,6 +19556,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "narciarstwo" @@ -19019,5 +19563,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19025,46 +19569,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "tablica historyczna" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "tablica przyrodnicza" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "tablica o zwierzętach" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19072,29 +19616,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "Edycja schronienia" @@ -19102,25 +19646,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "miejsce na ognisko" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "miejsce na piknik" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Edycja miejsca na piknik" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Miejsca historyczne" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "zamek" @@ -19129,19 +19673,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Edycja zamku" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "ruiny" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Edycja ruin" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Wykopaliska archeologiczne" @@ -19150,9 +19694,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Edycja wykopalisk archeologicznych" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "pole bitwy" @@ -19160,10 +19704,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Edycja pola bitwy" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19171,5 +19715,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19177,15 +19721,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "pomnik" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Edycja pomnika" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "miejsce pamięci" @@ -19193,55 +19737,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Edycja miejsca pamięci" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "krzyż przydrożny" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Edycja krzyża przydrożnego" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "kapliczka" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Edycja kapliczki" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Rozrywka" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "park wodny" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Edycja parku wodnego" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "plac zabaw" @@ -19249,35 +19793,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Edycja placu zabaw" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "miejsce do wędkowania" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Edycja miejsca do wędkowania" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "obiekty sportowe" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Edycja stadionu" @@ -19291,6 +19835,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "wybierz sport:" @@ -19682,30 +20226,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "sport" @@ -19715,225 +20259,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "różne sporty" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "łucznictwo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "lekkoatletyka" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "siatkówka" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "bule" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "gra w kule" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "kajakarstwo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "wspinaczka" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "krykiet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "krokiet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "kolarstwo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "wyścigi psów" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "jazda konna" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gimnastyka" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hokej" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "wyścigi konne" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "sporty motorowe" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "strzelectwo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "jazda na deskorolce" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "łyżwiarstwo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "narciarstwo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "piłka nożna" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "pływanie" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "tenis stołowy" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tenis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "centrum sportowe" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Edycja centrum sportowego" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "boisko" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Edycja boiska" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "tor wyścigowy" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Edycja toru wyścigowego" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "pole golfowe" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Edycja pola golfowego" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "miniaturowy golf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Edycja miniaturowego golfa" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "różne sporty" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -19972,21 +20516,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "rodzaj" @@ -20025,203 +20569,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "boisko" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "centrum sportowe" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "kręgle" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Edycja kręgli" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "lekkoatletyka" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Edycja" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "łucznictwo" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "wspinaczka" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "kajakarstwo" #. item "Sport/Canoeing" +#: build/trans_presets.java:1966 +msgid "Edit Canoeing" +msgstr "" + +#. item "Sport/Cycling" +#: build/trans_presets.java:1972 +msgid "Edit Cycling" +msgstr "" + #: build/trans_presets.java:1977 -msgid "Edit Canoeing" -msgstr "" - -#. item "Sport/Cycling" -#: build/trans_presets.java:1983 -msgid "Edit Cycling" -msgstr "" - -#: build/trans_presets.java:1988 msgid "Dog Racing" msgstr "wyścigi psów" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "jeździectwo" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "wyścigi konne" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "gimnastyka" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "sporty motorowe" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "łyżwiarstwo" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "jazda na deskorolce" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "pływanie" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "" @@ -20229,56 +20773,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Rodzaj trasy" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Poziom trudności" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "dla początkujących" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "łatwa" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "dla ekspertów" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "strzelectwo" @@ -20286,182 +20830,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Sporty z piłką" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "piłka nożna" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "football" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "australijski football" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "koszykówka" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "pole golfowe" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "bule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Edycja boiska do gry w boule" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "gra w kule" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "krykiet" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Edycja boiska do gry w krykieta" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "krykiet - siatki" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Edycja siatek do treningu gry w krykieta" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "krokiet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Edycja miejsca do gry w krokieta" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "hokej" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Edycja miejsca do gry w hokeja" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Edycja miejsca do gry w pelotę" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Edycja miejsca do gry w rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "tenis stołowy" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Edycja miejsca do gry w tenis stołowy" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Edycja miejsca do gry w tenisa" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Budynki" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "budynek" @@ -20469,5 +21013,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "budynek użyteczności publicznej" @@ -20475,10 +21019,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Edycja budynku użyteczności publicznej" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "ratusz" @@ -20486,10 +21030,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Edycja ratusza" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "ambasada" @@ -20497,10 +21041,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Edycja ambasady" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "sąd" @@ -20509,10 +21053,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Edycja siedziby sądu" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "więzienie" @@ -20521,10 +21065,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Edycja więzienia" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "posterunek policji" @@ -20534,10 +21078,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Edycja posterunku policji" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "straż pożarna" @@ -20546,10 +21090,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Edycja posterunku straży pożarnej" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "poczta" @@ -20557,5 +21101,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Edycja urzędu pocztowego" @@ -20563,15 +21107,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "przedszkole" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Edycja przedszkola" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "szkoła" @@ -20579,10 +21123,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Edycja szkoły" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "uniwersytet" @@ -20590,10 +21134,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Edycja uniwersytetu" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "college" @@ -20601,5 +21145,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Edycja college'u" @@ -20607,5 +21151,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "kino" @@ -20614,10 +21158,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Edycja kina" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "biblioteka" @@ -20626,9 +21170,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Edycja biblioteki" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "centrum kulturalne" @@ -20636,10 +21180,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Edycja centrum kulturalnego" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "teatr" @@ -20648,10 +21192,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Edycja teatru" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "miejsce kultu religijnego" @@ -20661,5 +21205,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Edycja miejsca kultu religijnego" @@ -20668,6 +21212,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religia" @@ -20676,66 +21220,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahaizm" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "buddyzm" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "chrześcijaństwo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hinduizm" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "dżinizm" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "judaizm" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "islam" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikhizm" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spirytualizm" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoizm" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zaratusztrianizm" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Wyznanie" @@ -20744,81 +21288,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "kościół anglikański" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptyści" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "kościół katolicki" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "ewangelikalizm" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "świadkowie Jehowy" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "luteranie" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "metodyści" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormoni" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "kościół prawosławny" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "zielonoświątkowcy" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "prezbiterianie" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestanci" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "kwakrzy" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "szyici" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunnici" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adresy" @@ -20827,5 +21371,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Edycja informacji o adresach" @@ -20833,5 +21377,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Numer domu" @@ -20839,20 +21383,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Nazwa domu" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Nazwa ulicy" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Nazwa miejscowości" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Kod pocztowy" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Kod kraju" @@ -20861,5 +21410,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Edycja interpolacji adresów" @@ -20867,61 +21416,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Sposób numeracji domów" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "nieparzyste" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "parzyste" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Obiekty sztuczne" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "zakład produkcyjny" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Edycja zakładu produkcyjnego" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "wieża" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Edycja wieży" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20929,25 +21478,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "wieża ciśnień" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Edycja wieży ciśnień" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "zbiornik gazu" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Edycja zbiornika gazu" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "latarnia morska" @@ -20955,10 +21504,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Edycja latarni morskiej" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "wiatrak" @@ -20966,10 +21515,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Edycja wiatraka" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "rurociąg" @@ -20978,37 +21527,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Edycja rurociągu" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gazowa" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "oczyszczalnia ścieków" @@ -21018,10 +21567,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Edycja oczyszczalni ścieków" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "dźwig" @@ -21029,10 +21578,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Edycja dźwigu" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "radiolatarnia" @@ -21040,10 +21589,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Edycja radiolatarni" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "punkt geodezyjny" @@ -21051,10 +21600,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Edycja punktu geodezyjnego" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "monitoring" @@ -21062,5 +21611,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Edycja kamery do monitoringu" @@ -21068,5 +21617,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "źródło energii elektrycznej" @@ -21076,35 +21625,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Edycja źródła energii elektrycznej" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "wiatrowa" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "wodna" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "cieplna" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "jądrowa" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "węglowa" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "fotowoltaiczna" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "elektrownia" @@ -21113,10 +21662,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Edycja elektrowni" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "rozdzielnia elektryczna" @@ -21125,5 +21674,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Edycja rozdzielni elektrycznej" @@ -21131,10 +21680,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "oznaczenie linii" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "słup elektryczny" @@ -21145,23 +21694,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Edycja słupa linii wysokiego napięcia" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "linia wysokiego napięcia" @@ -21170,75 +21719,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Edycja linii wysokiego napięcia" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Napięcie" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "toalety" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Uwagi" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "skrzynka pocztowa" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "telefon" @@ -21247,5 +21796,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Edycja telefonu" @@ -21253,5 +21802,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "na monety" @@ -21259,5 +21808,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "na banknoty" @@ -21265,5 +21814,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "na karty chipowe" @@ -21271,5 +21820,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "na karty debetowe" @@ -21277,15 +21826,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "na karty kredytowe" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "na karty telefoniczne" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "zbiórka odpadów" @@ -21294,5 +21843,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Edycja punktu zbiórki odpadów" @@ -21300,68 +21849,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "baterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "puszki" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "odzież" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "szkło" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "złom" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "ławka" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21432,39 +21976,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "zielony" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Ambona myśliwska" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Edycja ambony strzelniczej" @@ -21473,30 +22017,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Wysokość" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Ukryj" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Zablokuj" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "fontanna" @@ -21505,10 +22049,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Edycja fontanny" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "woda do picia" @@ -21517,10 +22061,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Edycja punktu z wodą pitną" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21528,33 +22072,56 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Sklepy" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Edycja warsztatu samochodowego" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +msgid "Bike Dealer" +msgstr "" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Edycja warsztatu rowerowego" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Edycja supermarketu" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "sklepik" @@ -21562,9 +22129,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Edycja sklepiku" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "kiosk" @@ -21572,27 +22139,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Edycja kiosku" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "automat sprzedający" @@ -21600,5 +22167,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Edycja automatu sprzedającego" @@ -21606,88 +22173,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Sprzedawane produkty" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "bilety komunikacji miejskiej" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "mapy komunikacji miejskiej" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "bilety parkingowe" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "jedzenie" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "napoje" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "słodycze" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "papierosy" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "zdjęcia" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "jedzenie dla zwierząt" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "gazety" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "zabawki" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "znaczki" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "karty SIM" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "vouchery" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "prezerwatywy" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampony" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "torby na odchody" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "rzeźnik" @@ -21695,9 +22262,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Edycja sklepu mięsnego" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "piekarnia" @@ -21705,9 +22272,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Edycja piekarni" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "florysta" @@ -21715,18 +22282,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Edycja kwiaciarni" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "naturalna żywność" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Edycja sklepu z naturalną żywnością" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "monopolowy" @@ -21734,54 +22301,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "napoje" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Komputer" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Edycja sklepu komputerowego" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "elektronika" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Edycja sklepu z elektroniką" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "sprzęt hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Edycja sklepu ze sprzętem hi-fi" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "meble" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Edycja sklepu meblowego" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "centrum ogrodnicze" @@ -21789,9 +22356,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Edycja centrum ogrodniczego" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21799,9 +22366,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "sklep DIY" @@ -21809,54 +22376,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Edycja sklepu DIY (zrób to sam)" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "artykuły biurowe" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Edycja sklepu z artykułami biurowymi" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "fryzjer" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Edycja salonu fryzjerskiego" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "obuwie" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Edycja sklepu obuwniczego" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "zabawki" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Edycja sklepu z zabawkami" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "pralnia chemiczna" @@ -21864,9 +22431,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Edycja palni chemicznej" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "pralnia samoobsługowa" @@ -21874,9 +22441,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "wyspa" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "sklep turystyczny" @@ -21884,28 +22451,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Edycja sklepu ze sprzętem turystycznym" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Edycja sklepu sportowego" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Edycja optyka" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Gotówka" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "bank" @@ -21913,14 +22480,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Edycja banku" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "kantor" @@ -21928,5 +22495,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Edycja kantoru" @@ -21934,15 +22501,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Edycja bankomatu" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Zdrowie" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "lekarz" @@ -21950,18 +22517,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Edycja lekarza" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "dentysta" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Edycja dentysty" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "apteka" @@ -21969,5 +22536,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Edycja apteki" @@ -21975,9 +22542,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "realizacja recept" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "szpital" @@ -21985,10 +22552,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Edycja szpitala" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -21997,5 +22564,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -22004,20 +22571,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Numer punktu" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Numer telefonu" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)" @@ -22025,5 +22592,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "weterynarz" @@ -22032,64 +22599,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Edycja lecznicy weterynaryjnej" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Miejsca" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "kontynent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Edycja kontynentu" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "kraj" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Edycja kraju" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "stan" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Edycja stanu" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Edycja regionu" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "okręg" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Edycja okręgu / hrabstwa" @@ -22097,15 +22664,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "miasto" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Edycja miasta" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "miejscowość" @@ -22113,10 +22680,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Edycja miejscowości" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "dzielnica" @@ -22124,25 +22691,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Edycja dzielnicy" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "wieś" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Edycja wsi" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "przysiółek" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Edycja wólki" @@ -22150,5 +22717,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "okolica" @@ -22156,10 +22723,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Edycja okolicy" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "wyspa" @@ -22167,10 +22734,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Edycja wyspy" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22178,5 +22745,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22184,5 +22751,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "wejście do jaskini" @@ -22190,10 +22757,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Edycja wejścia do jaskini" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "wzgórze" @@ -22201,10 +22768,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Edycja wzgórza" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "lodowiec" @@ -22212,10 +22779,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Edycja lodowca" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "wulkan" @@ -22223,70 +22790,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Edycja wulkanu" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Granice" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "narodowa" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Edycja granicy narodowej" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "administracyjna" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Edycja granicy administracyjnej" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Edycja granicy politycznej" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "park narodowy" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Edycja granicy parku narodowego" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Zagospodarowanie terenu" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "drzewo" @@ -22295,15 +22862,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Edycja drzewa" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Nazwa systematyczna" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "las" @@ -22312,5 +22879,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Edycja lasu" @@ -22318,17 +22885,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "iglasty" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "liściasty" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "mieszany" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "las" @@ -22337,14 +22904,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Edycja lasu" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "rezerwat przyrody" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Edycja rezerwatu przyrody" @@ -22352,25 +22919,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "rumowisko" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Edycja rumowiska" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "busz" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Edycja buszu" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "turnia" @@ -22378,10 +22945,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Edycja turni" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "wrzosowisko" @@ -22389,5 +22956,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Edycja wrzosowiska" @@ -22395,5 +22962,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "zagroda" @@ -22402,45 +22969,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Edycja zagrody" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "grunty rolne" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Edycja gruntów rolnych" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "łąka" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Edycja łąki" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "winnica" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Edycja winnicy" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "ogródki działkowe" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Edycja ogródków działkowych" @@ -22448,25 +23015,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "ogród" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Edycja ogrodu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Trawa" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22474,10 +23041,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "miejsce publiczne" @@ -22485,20 +23052,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Edycja miejsca publicznego" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Edycja parku" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Teren rekreacyjny" @@ -22506,5 +23073,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Edycja terenu rekreacyjnego" @@ -22512,15 +23079,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "zabudowa mieszkaniowa" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Edycja zabudowy mieszkaniowej" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "cmentarz" @@ -22528,9 +23095,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Edycja cmentarza" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "cmentarz" @@ -22538,39 +23105,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Edycja cmentarza" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "handel" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Edycja obszaru handlowego" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "biura i usługi" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Edycja obszaru biur i usług" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "teren przemysłowy" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Edycja terenu przemysłowego" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "teren kolejowy" @@ -22578,15 +23145,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Edycja terenu kolejowego" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "obszar wojskowy" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Edycja obszaru wojskowego" @@ -22594,55 +23161,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "budowa" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Edycja terenu budowy" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "teren pod zabudowę" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Edycja terenu pod zabudowę" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "wysypisko" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Edycja wysypiska śmieci" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "kamieniołom" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Edycja komieniołomu" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "" @@ -22652,5 +23219,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "" @@ -22659,10 +23226,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "zewnętrzny segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "wewnętrzny segment" @@ -22670,5 +23237,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "ograniczenia skrętu" @@ -22677,5 +23244,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Edycja ograniczenia skrętu" @@ -22683,34 +23250,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Ograniczenie" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "brak skrętu w lewo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "brak skrętu w prawo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "zakaz jazdy prosto" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "zakaz zawracania" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "nakaz skrętu w prawo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "nakaz skrętu w lewo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "nakaz jazdy prosto" @@ -22719,15 +23286,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "z drogi" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "przez węzeł lub drogę" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "do drogi" @@ -22735,5 +23302,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Trasa" @@ -22742,5 +23309,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Edytuj trasę" @@ -22748,5 +23315,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Typ trasy" @@ -22818,24 +23385,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "droga" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "prom" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22888,5 +23455,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22895,13 +23462,13 @@ msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "tramway" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "objazd" @@ -22915,10 +23482,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Opis symboli" @@ -22926,31 +23493,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Sieć" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "proponowany" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "alternatywny" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "tymczasowy" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "połaczenie" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Kolor (hex)" @@ -22959,30 +23526,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23193,130 +23760,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23333,98 +23774,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "przestarzały" @@ -23801,7 +24151,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23865,13 +24215,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "kolej" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23887,5 +24316,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "serwis" @@ -23899,5 +24328,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23918,5 +24347,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "" @@ -23931,5 +24360,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23944,5 +24373,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "brzeg rzeki" @@ -23956,5 +24385,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "strumień" @@ -23968,5 +24397,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "Dok" @@ -23988,16 +24417,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "akwedukt" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24094,4 +24511,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24160,13 +24584,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24212,6 +24636,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24228,7 +24652,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24251,10 +24675,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24290,11 +24714,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "stare szyny kolejowe" #. color rail +#. #. 1 #. 50000 @@ -24335,6 +24760,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24348,5 +24773,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "Terminal" @@ -24368,5 +24793,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24380,5 +24805,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24386,4 +24811,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24433,7 +24865,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "droga powietrzna" @@ -24450,5 +24882,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24463,5 +24895,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24476,5 +24908,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24489,5 +24921,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24502,5 +24934,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24515,5 +24947,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24633,11 +25065,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "energia" @@ -24651,5 +25083,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "nabrzeże" @@ -24663,5 +25095,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "" @@ -24789,12 +25221,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "wypoczynek" @@ -24808,5 +25257,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "marina" @@ -24844,4 +25293,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24860,4 +25325,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24878,8 +25351,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "udogodnienie" @@ -24981,10 +25456,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25238,5 +25713,5 @@ #. #. -#. +#. #. color health #. @@ -25382,4 +25857,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25399,23 +25882,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25447,6 +25930,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25507,14 +25990,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "zdrowie" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25861,5 +26344,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25882,5 +26364,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "sklep" @@ -25952,8 +26435,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotel" @@ -26054,9 +26537,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turystyka" @@ -26144,9 +26627,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "historia" @@ -26160,5 +26643,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "kamieniołom" @@ -26172,5 +26655,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "Wysypisko smieci" @@ -26192,5 +26675,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "Basen" @@ -26204,5 +26687,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "las" @@ -26216,5 +26699,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26237,5 +26720,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "" @@ -26249,5 +26732,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "Teren przemysłowy" @@ -26261,5 +26744,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26273,5 +26756,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26285,5 +26768,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "Teren kolejowy" @@ -26340,7 +26823,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "Teren wojskowy" @@ -26354,5 +26837,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "cmentarz" @@ -26365,5 +26848,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "szczyt" @@ -26378,5 +26861,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "lodowiec" @@ -26390,5 +26873,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "wulkan" @@ -26443,8 +26926,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26458,5 +26941,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "" @@ -26470,5 +26953,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "zdrowie" @@ -26482,5 +26965,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26494,5 +26977,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "błoto" @@ -26506,5 +26989,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "plaża" @@ -26582,8 +27065,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "droga" @@ -26631,7 +27114,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "granica" @@ -26781,11 +27264,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "Miejsce" @@ -26833,6 +27316,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adres" @@ -27188,147 +27671,155 @@ msgstr "" -#~ msgid "Images for {0}" -#~ msgstr "Obrazy dla {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Wczytaj GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Brak znacznika czasowego dla punktu {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym" - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS początek: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS koniec: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "aktualne przesunięcie: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "różnica stref czasowych: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} wewnątrz ścieżki GPS." +#~ msgid "Updating primitive" +#~ msgstr "Odświeżam element" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Brak nawiasu zamykającego." + +#~ msgid "" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" +#~ msgstr "" +#~ "Aktualna ilość zmian przekracza maksymalną możliwą ilość. Aktualna ilość " +#~ "zmian to {0} z możliwych {1}" + +#~ msgid "All images" +#~ msgstr "Wszystkie obrazy" + +#~ msgid "GPX Track loaded" +#~ msgstr "Ślad GPX wczytany" + +#~ msgid "Enable proxy server" +#~ msgstr "Używaj serwera proxy" + +#~ msgid "Anonymous" +#~ msgstr "Anonimowy" + +#~ msgid "Proxy server host" +#~ msgstr "Proxy - adres serwera" + +#~ msgid "Proxy server port" +#~ msgstr "Proxy - port serwera" + +#~ msgid "Proxy server username" +#~ msgstr "Proxy - nazwa użytkownika" + +#~ msgid "Proxy server password" +#~ msgstr "Proxy - hasło" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "" +#~ "Wyjątek NullPointerException, prawdopodobnie brakuje jakichś znaczników." + +#~ msgid "Preparing..." +#~ msgstr "Przygotowywanie..." + +#~ msgid "Uploading..." +#~ msgstr "Wysyłanie..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Nieprawidłowe hasło lub nazwa użytkownika." + +#~ msgid "Enter Password" +#~ msgstr "Wprowadź hasło" + +#~ msgid "Login" +#~ msgstr "Logowanie" + +#~ msgid "Interpolation" +#~ msgstr "Interpolacja" + +#~ msgid "Shop" +#~ msgstr "warsztat" + +#~ msgid "aqueduct" +#~ msgstr "akwedukt" + +#~ msgid "Move" +#~ msgstr "Przenieś" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania." + +#~ msgid "Unknown file extension." +#~ msgstr "Nieznane rozszerzenie pliku." + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Unsaved Changes" +#~ msgstr "Niezapisane zmiany" + +#~ msgid "Object" +#~ msgstr "Obiekt" + +#~ msgid "Unknown version" +#~ msgstr "Nieznana wersja" + +#~ msgid "true" +#~ msgstr "prawda" + +#~ msgid "false" +#~ msgstr "fałsz" + +#~ msgid "unnamed" +#~ msgstr "bez nazwy" #~ msgid "Sync clock" #~ msgstr "Synchronizuj zegar" -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie." +#~ msgid "Data Layer" +#~ msgstr "Warstwa danych" + +#~ msgid "Error while parsing" +#~ msgstr "Błąd podczas przetwarzania" #~ msgid "Image" #~ msgstr "Obraz" -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Synchronizuj czas z urządzeniem GPS" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Podany czas nie został rozpoznany." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Geotagowane obrazy" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Otwórz obrazy za pomocą AgPifoJ..." +#~ msgid "name" +#~ msgstr "nazwa" + +#~ msgid "my version:" +#~ msgstr "moja wersja:" + +#~ msgid "their version:" +#~ msgstr "ich wersja:" + +#~ msgid "Cannot connect to server." +#~ msgstr "Nie można połączyć się z serwerem." + +#~ msgid "Date" +#~ msgstr "Data" + +#~ msgid "Revert" +#~ msgstr "Wycofaj" + +#~ msgid "OSM username (email)" +#~ msgstr "Użytkownik OSM (email)" + +#~ msgid "Use preset ''{0}'' of group ''{1}''" +#~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\"" + +#~ msgid "Use preset ''{0}''" +#~ msgstr "Używa szablon \"{0}\"" + +#~ msgid "position" +#~ msgstr "pozycja" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?" + +#~ msgid "zoom" +#~ msgstr "powiększenie" + +#~ msgid "Validate" +#~ msgstr "Zweryfikuj" #~ msgid "osmarender options" #~ msgstr "opcje osmarender" - -#~ msgid "Move" -#~ msgstr "Przenieś" - -#~ msgid "File could not be found." -#~ msgstr "Plik nie został odnaleziony." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania." - -#~ msgid "Unknown file extension." -#~ msgstr "Nieznane rozszerzenie pliku." - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Unsaved Changes" -#~ msgstr "Niezapisane zmiany" - -#~ msgid "Object" -#~ msgstr "Obiekt" - -#~ msgid "Unknown version" -#~ msgstr "Nieznana wersja" - -#~ msgid "true" -#~ msgstr "prawda" - -#~ msgid "false" -#~ msgstr "fałsz" - -#~ msgid "unnamed" -#~ msgstr "bez nazwy" - -#~ msgid "Data Layer" -#~ msgstr "Warstwa danych" - -#~ msgid "Error while parsing" -#~ msgstr "Błąd podczas przetwarzania" - -#~ msgid "name" -#~ msgstr "nazwa" - -#~ msgid "my version:" -#~ msgstr "moja wersja:" - -#~ msgid "their version:" -#~ msgstr "ich wersja:" - -#~ msgid "Cannot connect to server." -#~ msgstr "Nie można połączyć się z serwerem." - -#~ msgid "Date" -#~ msgstr "Data" - -#~ msgid "Revert" -#~ msgstr "Wycofaj" - -#~ msgid "OSM username (email)" -#~ msgstr "Użytkownik OSM (email)" - -#~ msgid "Use preset ''{0}'' of group ''{1}''" -#~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\"" - -#~ msgid "Use preset ''{0}''" -#~ msgstr "Używa szablon \"{0}\"" - -#~ msgid "position" -#~ msgstr "pozycja" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?" - -#~ msgid "zoom" -#~ msgstr "powiększenie" - -#~ msgid "Validate" -#~ msgstr "Zweryfikuj" #~ msgid "Station" @@ -27485,4 +27976,7 @@ #~ msgstr "Most zwodzony" +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchronizuj czas z urządzeniem GPS" + #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "" @@ -27497,4 +27991,7 @@ #~ msgid "File not found" #~ msgstr "Plik nie został odnaleziony" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona." #~ msgid "Conflicts: {0}" @@ -27561,4 +28058,25 @@ #~ msgstr "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać." +#~ msgid "GPS start: {0}" +#~ msgstr "GPS początek: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS koniec: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "aktualne przesunięcie: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "różnica stref czasowych: " + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Podany czas nie został rozpoznany." + #~ msgid "Login name (email) to the OSM account." #~ msgstr "Login (adres email) konta OSM" @@ -27610,4 +28128,10 @@ #~ msgstr "Nie można odczytać wyników wyszukiwania z serwera." +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Otwórz obrazy za pomocą AgPifoJ..." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotagowane obrazy" + #~ msgid "Remove Selected" #~ msgstr "Usuń zaznaczone" @@ -27616,4 +28140,10 @@ #~ msgstr "Podstawowe" +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Brak znacznika czasowego dla punktu {0} x {1}" + +#~ msgid "Images for {0}" +#~ msgstr "Obrazy dla {0}" + #~ msgid "sports" #~ msgstr "Sklep sportowy" @@ -27649,6 +28179,12 @@ #~ msgstr "Przesuń w dół" +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie." + #~ msgid "Tagging preset source" #~ msgstr "Źródło szablonów" + +#~ msgid "{0} within the track." +#~ msgstr "{0} wewnątrz ścieżki GPS." #~ msgid "" @@ -27658,4 +28194,13 @@ #~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w " #~ "liście historia poleceń." + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym" + +#~ msgid "Read GPX..." +#~ msgstr "Wczytaj GPX..." #~ msgid "Edit Properties" Index: /applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- /applications/editors/josm/i18n/po/pt_BR.po (revision 19198) +++ /applications/editors/josm/i18n/po/pt_BR.po (revision 19199) @@ -4,10 +4,11 @@ # FIRST AUTHOR , 2009. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-12-03 19:26+0000\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-06 15:42+0000\n" "Last-Translator: Rodrigo de Avila \n" "Language-Team: Brazilian Portuguese \n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:16+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Criando tela principal" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Ajuda" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL malformada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Aviso" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando arquivo malformado: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Não pode ler o ficheiro ''{0}''.
Erro:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Não pode ler o ficheiro ''{0}''.
Erro:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "Sobre o JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -280,5 +282,5 @@ "provavelmente, falhar. A URL base da API é: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -290,5 +292,5 @@ "\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -300,15 +302,20 @@ "para terminar." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Continuar" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -317,29 +324,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -356,5 +364,10 @@ msgstr "Cancelar" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Clique para cancelar a mesclagem de nós" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Por favor, selecione pelo menos um nó, caminho ou relação." @@ -370,5 +383,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Combinar" @@ -388,15 +401,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Adicionar Nó..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Adicionar nó através da entrada de latitude e longitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -412,22 +425,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Editar: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Digite as coordenadas do novo nó." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Usar casas decimais." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valores negativos são para coordenadas dos hemisférios Sul/Oeste." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -436,5 +449,5 @@ msgstr "Latitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -443,28 +456,29 @@ msgstr "Longitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "Por favor digite uma latitude válida entre -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "Por favor digite uma latitude entre -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "Por favor digite uma longitude válida entre -180..180" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "Por favor digite uma longitude entre -180..180" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -476,9 +490,9 @@ msgstr "Aceitar" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "Feche a janela de diálogo e crie um novo nó" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "Feche a janela de diálogo, não crie um novo nó" @@ -499,18 +513,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -522,5 +536,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -542,6 +556,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -588,5 +602,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflito" @@ -623,14 +637,15 @@ msgstr "Não há conflitos para se aproximar" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Encerrar changesets abertos" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Encerra changesets abertos" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -640,21 +655,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Arquivo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Não há nenhum changeset aberto" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Nenhum changeset aberto" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Baixando changeset abertos ..." @@ -741,11 +756,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -824,16 +840,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -869,5 +890,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplicar" @@ -910,10 +931,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Exportar para GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Exportar dados para arquivo GPX." @@ -928,12 +949,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -958,8 +979,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -970,10 +991,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -986,17 +1007,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1034,22 +1055,27 @@ msgstr "Mostrar informações de objeto sobre nós, caminhos ou relações do OSM." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Por favor selecione no mínimo 2 caminhos a combinar" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1059,38 +1085,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1098,33 +1120,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Entrada de valores para todos conflitos" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Resolver conflitos" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1289,5 +1311,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Não é possível mover objetos para fora do planeta." @@ -1367,28 +1389,28 @@ msgstr "Baixar dados" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Ortogonalizar prancha" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Mover nós ao ponto de todos ângulos serem 90 ou 270 graus" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 msgid "Orthogonalize Shape / Undo" msgstr "Ortogonalizar Forma / Desfazer" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 msgid "Undo orthogonalization for certain nodes" msgstr "Desfazer ortogonalização para alguns nós" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "Ortogonalizar / Desfazer" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1397,9 +1419,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "Desfazer Ortogonalizar Forma" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1411,16 +1433,16 @@ "Mude sua projeção para se livrar do presente aviso.
Quer continuar?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Ortogonalizar" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Utilização" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "Os Elementos selecionados não podem ser ortogonalizados" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Ortogonalizar" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1495,18 +1517,18 @@ msgstr "Não foi possível renomear arquivo ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Reverter Caminhos" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Reverter a direção de todos caminhos selecionados." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Favor selecionar no mínimo um caminho." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Reverter caminhos" @@ -1515,10 +1537,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Salvar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Salvar dados atuais" @@ -1575,10 +1597,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Salvar como..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Salvar os dados atuais para um novo arquivo." @@ -1622,6 +1644,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1653,5 +1674,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1717,5 +1738,5 @@ "no meio do caminho.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1725,5 +1746,5 @@ "caminhos novos.
Deverá verificar isto e corrigir quando necessário." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1733,5 +1754,5 @@ "
Deverá verificar isto e corrigir quando necessário." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1765,45 +1786,45 @@ msgstr "Este nó não esta grudado a nada." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Nenhum destes nós está grudado a algo." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Nenhum dos nós destes caminhos está grudado a algo." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "A seleção atual não pode ser usada para desgrudar" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Selecione entre:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Um nó comentado, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Um nó que é usado em mais de um caminho, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* Um nó que é usado em mais de um caminho e um destes caminhos, ou" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" "* Um caminho e um ou mais de seus nós que são usados por mais de um caminho." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1818,9 +1839,9 @@ "cópia e todos os nós serão selecionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Nó não grudado" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1828,5 +1849,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1861,10 +1882,10 @@ msgstr "Desmarcar tudo (Sair)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Atualizar dados" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "Atualiza a partir do servidor os objetos na camada de dados ativa" @@ -1872,23 +1893,23 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "Dados baixados" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Nenhum grupo de dados encontrado" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "Não consegui encontrar o objeto de id {0} no dataset atual" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "Atualizar seleção" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1897,31 +1918,27 @@ "novamente os dados)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Atualizar Seleção" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "Não há objetos a atualizar." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Seleção vazia" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "Atualiza objetos" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Enviar dados" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" "Envia todas as mudanças na camada de dados ativa para o servidor do OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1932,5 +1949,5 @@ "resolvê-los primeiro." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1938,155 +1955,7 @@ msgstr "Não há modificações a enviar." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Não há nada a enviar. Baixe dados primeiro." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "Sincronizar apenas o nó {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "Sincronizar apenas o caminho {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Sincronizar apenas a relação {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synchronizar todo o conjunto de dados" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"Envio falhou porque o servidor tem uma nova versão de " -"um
de seus nós, caminhos ou relações.
Este conflito é causado por " -"{0} com id {1},
o servidor tem a versão " -"{2}, e sua versão é {3}.

Clique {4} para sincronizar " -"somente a primitiva conflitante.
Clique {5} para " -"sincronizar todo o conjunto de dados locais no servidor
Clique {6}" -" para abortar e continuar editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Conflitos detectados" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Envio falhou porque o servidor tem uma nova versão de " -"um
de seus nós, caminhos ou relações..

Clique {0} para sincronizar todos o conjuntos de dados locais com o servidor." -"
Clique {1} para abortar e continuar editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"O envio falhou porque você está usando
o changeset " -"{0} que já foi fechado em {1}.
Por favor envie novamente em um changeset " -"novo ou aberto." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Changeset fechado" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "Preparar a resolução de conflitos" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "Clique para cancelar e voltar a editar o mapa" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" -"O envio de dados falhou porque você tentou apagar o " -"nó {0} que ainda é usado pela via {1}.

Clique {2} " -"para baixar todas as vias que contém o nó {0}.
Se for necessário o JOSM " -"criará conflitos que você poderá resolver através da Janela de Resolução de " -"Conflitos." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "Nó ainda em uso" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Atualizando primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "A enviar informação para a camada \"{0}\"" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Aviso: objeto \"{0}\" já foi apagado no servidor. Ignorando esse objeto e " -"tentando novamente o envio de dados." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" -"Objeto \"{0}\" já foi apagado. Ignorando esse objeto no envio de dados." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "Enviando {0} objetos..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" -"Ignorando exceção capturada porque o envio de dados foi cancelado. Exceção é " -"{0}" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2222,9 +2091,9 @@ msgstr "Dados GPX baixados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Baixando dados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2234,5 +2103,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "Nenhum informação desta área encontrada" @@ -2311,7 +2180,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2328,58 +2197,52 @@ "usados ao apagar um caminho. Ctrl: apaga objetos referentes." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Desenhar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Desenhar nós" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Modo: Desenhar Foco" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "selecionado" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Não é possível adicionar nó fora do planeta." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Adicionar nó" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Adicionar nó no caminho" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Conectar caminho existente a nó" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Adicionar um novo nó a um caminho existente" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Adicionar nó em um caminho e conectar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Criar novo nó." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Selecionar nó sob o cursor." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2388,14 +2251,14 @@ msgstr[1] "Inserir novo nó em {0} caminhos." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Começar novo caminho a partir do último nó." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Continuar caminho a partir do último nó." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Finalizar desenho." @@ -2439,18 +2302,19 @@ "áudio dali. SHIFT+soltar para sincronizar o áudio naquele ponto." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Selecionar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Selecionar, mover e girar objetos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2459,17 +2323,17 @@ msgstr[1] "Adicionar e mover um novo nó virtual a {0} caminhos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Mover elementos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Mova-os" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Desfazer mover" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2482,13 +2346,13 @@ "Quer realmente move-los?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Mover sempre e não mostrar dica outraves" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Solte o botão do mouse para selecionar os objetos no retângulo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2497,9 +2361,9 @@ "próximo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Solte o botão do mouse para parar de girar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2511,5 +2375,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Ampliar" @@ -2533,5 +2397,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Busca por objetos." @@ -2622,7 +2486,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - todos os objetos modificados por determinado usuário" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2631,8 +2494,20 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nós:... - objeto com um determinado número de nós" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" +"marcadores:... - objeto com o número pedido de marcadores (tags:count " +"ou tags:min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2642,21 +2517,27 @@ "ou tags:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modificado - todos os objetos modificados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selecionados - todos os objetos selecionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incompletos - todos os objetos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "não tagueados - todos objetos não tagueados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2664,5 +2545,5 @@ "child expr - todos objetos filhos que coincidem com a expressão" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2671,19 +2552,19 @@ "expressão" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Use | ou OR para combinar com \"ou\" lógico" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Usar \" para operadores de aspas (se a chave contém :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Usar ( and ) para agrupar expressões" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2691,55 +2572,55 @@ msgstr "Filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "Aplicar o filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Iniciar Pesquisa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Não há valores coincidentes para ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nada adicionado à seleção pela busca por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nada foi removido da seleção quando buscado por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nada encontrado na seleção ao pesquisar por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Encontrados {0} resultados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2753,5 +2634,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2759,10 +2640,10 @@ "chave=valor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Erro de sintaxe do padrão: padrão {0} em {1} é ilegal!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2771,26 +2652,29 @@ "ou relação." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Credencial de autenticação inesperada: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Faltam argumentos para \"or\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Falta argumento para \"not\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Fechamento de parenteses esperado." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Faltam argumentos para \"or\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "Número errado de parâmetros para o operador de tags" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2799,9 +2683,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Número de parametros incorreto para operador de nós." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2812,7 +2696,12 @@ "de nós ou um intervalo, por exemplos, os nós:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Valor incorreto do operador de id: {0}. Se esperava um número." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Valor incorreto do operador de id: {0}. Se esperava um número." @@ -2846,44 +2735,30 @@ msgstr "Erro de comunicação com o servidor." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"O número de alterações atuais ultrapassa o número máximo de alterações. O " -"número atual é {0}, o máximo é {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Violação de Précondição" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" +"{0} nós no caminho {1} ultrapassam o número máximo de nós permitidos {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Violação de Capacidades da API" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Aviso: truncanto automaticamente o valor da tag ''{0}'' na primitiva " -"deletada {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"O tamanho do valor para a tag ''{0}'' na primitiva {1} excede o tamanho " -"máximo permitido de {2}. O tamanho é {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Violação de Précondição" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"{0} nós no caminho {1} ultrapassam o número máximo de nós permitidos {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2995,5 +2870,5 @@ msgstr "Definir {0}={1} para {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -3010,5 +2885,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Conflito duplo" @@ -3109,4 +2984,19 @@ msgstr "Resolver conflitos em estado de exclusão em {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3220,5 +3110,5 @@ msgstr "Aplicar?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3302,15 +3192,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, 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:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3321,5 +3211,5 @@ "\"{0}\" não é uma directória." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3330,5 +3220,5 @@ "preferência \"{0}\" não é uma directória." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3339,5 +3229,5 @@ "falta da directória da preferência: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3348,5 +3238,5 @@ "devido a falta da directória da preferência: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3356,5 +3246,5 @@ "preferências base." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3365,5 +3255,5 @@ "ficheiro de preferência base." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3374,5 +3264,5 @@ "de preferências base: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3384,5 +3274,5 @@ "preferências base." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3393,10 +3283,10 @@ "preferências para original: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3404,24 +3294,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Preferências gravadas em {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Não foi possível enviar preferências. Motivo: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Não foi possível obter preferências do servidor." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3430,5 +3320,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3457,5 +3347,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3477,31 +3367,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "O" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "L" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3509,5 +3392,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3518,27 +3401,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3546,5 +3429,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3556,5 +3439,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3562,25 +3445,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "Text" msgstr "Texto" #. column header: apply filter for children +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3588,43 +3471,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "parametro {0} > 0 necessário. Obtido {1}." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3632,5 +3527,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3658,10 +3553,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3669,7 +3560,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3684,5 +3575,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3700,146 +3591,138 @@ msgstr "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Caminho para Estilo de Área não está fechado." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "via multipolígonos \"{0}\" não está fechada." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Apagado membro ''{0}'' na relação." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Way ''{0}'' com menos de dois pontos." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Mais de um caminho \"de\" encontrado." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Mais de um caminho \"para\" encontrado." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Encontrado mais de um parâmetro \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Regra desconhecida \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo de membro desconhecido para \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Nenhum caminho \"de\" encontrado." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Nenhuma caminho \"para\" encontrado." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Não encontrei nenum nó ou caminho com o parâmetro \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "O caminho \"de\" não começa ou termina em um nó \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "O trecho \"to\" não começa ou termina no nó \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "O trecho \"from\" não começa ou termina no caminho \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "O trecho \"to\" não começa ou termina em um nó \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Estilo para restrição {0} não encontrado." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Interseção entre as vias \"{0}\" e \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Via interna \"{0}\" está fora." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Regra não aplicável ''{0}'' para Way ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "\"{0}\" não é um caminho no multipolígono." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Não há via externa no multipolígono \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Estilo para caminho interno \"{0}\" é multipolígono." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Estilo para via externa \"{0}\" contém erros." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "não tagueado" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "texto" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Erro: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Aviso: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "inativo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "selecionado" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3848,6 +3731,6 @@ msgstr[1] "nós" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3856,7 +3739,8 @@ msgstr[1] "vias" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3865,21 +3749,37 @@ msgstr[1] "relações" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "via não tagueada" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "via incompleta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "segundo plano" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "ressaltar" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "não tagueado" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "texto" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -4021,5 +3921,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "ferrovia" @@ -4035,7 +3935,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4051,4 +3951,10 @@ msgstr[1] "{0} membros" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4080,6 +3986,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Conflito" @@ -4093,7 +3999,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4178,74 +4084,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nome do Usuário" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Senha" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "opções" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Mostar essa ajuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Argumento padrão de geometria unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Baixar o retângulo limite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Abrir arquivo (como raw gps, se .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Baixar o retângulo limite como dados de gps brutos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Selecionar dentro da busca" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Executar em modo maximizado" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Resetar preferência para default" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Escolha o idioma." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/TRILHA/PARA/PASTA/DO/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4254,9 +4160,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "exemplos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4267,36 +4173,36 @@ "alguma coisa antes de --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Em vez de --download=, você pode especificar osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Ativando plugins atualizados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Carregando plugins anteriores" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Aplicando padrão" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Carregando plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Configuração {0} das preferências foi removida pois não é mais usada." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Arquivo" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4311,22 +4217,22 @@ msgstr "Editar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Ferramentas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Predefinições" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4334,5 +4240,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Audio" @@ -4411,13 +4317,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "Usuário:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "camada não está na lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4452,5 +4359,5 @@ msgstr "Inicializando" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4458,6 +4365,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4466,5 +4373,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4473,5 +4380,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4480,25 +4387,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4506,9 +4413,9 @@ msgstr "Regra" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4540,11 +4447,11 @@ msgstr "regra {0} não participa no par de comparação {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Propriedades" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4553,6 +4460,6 @@ msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4560,6 +4467,6 @@ msgstr "Nós" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4567,23 +4474,23 @@ msgstr "Membros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Nenhum conflito de tags pendentes a ser resolvido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Etiquetas({0} conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} conflitos de tagueamento à serem resolvidos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Nós (resolvido)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4592,17 +4499,17 @@ "lista de nós desta via." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Nós (com conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Conflitos pendentes na lista de nós desta via" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Membros(resolvido)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4612,21 +4519,21 @@ "na lista de membros desta relação" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Membros(com conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "Conflitos pendentes na lista de membros desta relação" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Nenhum conflito de propriedades pendente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Propriedades(com conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Conflito de propriedades pendente de solução" @@ -4658,22 +4565,22 @@ msgstr "item {0} não encontrado na lista" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "bloquear scrolling" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Comparar " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Minha versão" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Lista dos elementos dos meu dados, ou seja, dados locais" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4681,5 +4588,5 @@ msgstr "Versão mesclada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4689,27 +4596,27 @@ "as decisões de mesclagem forem aplicadas." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Sua versão" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" "Lista de elementos de seu conjunto de dados, ou seja, o servidor de dados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr ">topo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Copiar meus nós selecionados para o início da lista de nós combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr ">botão" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" @@ -4717,5 +4624,5 @@ "combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4725,5 +4632,5 @@ "lista de elementos combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4733,5 +4640,5 @@ "na lista de elementos combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4740,5 +4647,5 @@ "combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" @@ -4746,5 +4653,5 @@ "combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4754,5 +4661,5 @@ "selecionado na lista de elementos combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4762,23 +4669,23 @@ "selecionado na lista de elementos combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Acima" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Move uma posição acima os elementos selecionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Abaixo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Mover para baixo as entradas selecionadas em uma posição" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4789,27 +4696,27 @@ msgstr "Remover" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "Remover as entradas selecionadas da lista de elementos combinados" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Congelar" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Congelar" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Congelar a lista atual de elementos mesclados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Descongelar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Descongelar a lista de elementos mesclados e iniciar mesclagem" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4820,5 +4727,5 @@ "e as deles" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4829,5 +4736,5 @@ "entradas e as deles" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4836,5 +4743,5 @@ msgstr[1] "Minha versão ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4843,5 +4750,5 @@ msgstr[1] "Versão combinada ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4850,5 +4757,5 @@ msgstr[1] "Sua versão ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4858,5 +4765,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5106,10 +5013,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5119,10 +5026,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5207,9 +5114,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5217,6 +5124,6 @@ msgstr "nenhum" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "todos os números" @@ -5305,7 +5212,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5315,6 +5222,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5422,4 +5329,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Excluir os objetos selecionados." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Changeset fechado" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Baixar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Baixar mapa do servidor OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Encerra changesets abertos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Mostrar informações" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Abrir um editor para a relação selecionada" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5433,12 +5392,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5456,18 +5415,18 @@ msgstr "Pilha de comandos: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "Abrir uma janela de união dos itens selecionados na lista acima." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5477,25 +5436,25 @@ "acima." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancelar a resolução de conflitos e fechar a janela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Aplicar a resolução de conflitos e fechar a janela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Aplicar a resolução" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "Fechar assim mesmo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "Continuar resolvendo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5507,26 +5466,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "Conflito não resolvido completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Resolver conflitos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5537,41 +5496,41 @@ msgstr "Adicionar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5610,5 +5569,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5623,34 +5582,34 @@ msgstr "Abrir uma lista com camadas carregadas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Excluir camada selecionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Mostrar/Ocultar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Mudar estado de visibilidade do layer selecionado." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Ativar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Ativar camada selecionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Combinar esta camada em outra camada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Mover a camada selecionada uma linha acima." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Mover camada selecionada uma linha abaixo." @@ -5660,5 +5619,176 @@ msgstr "Informação sobre camada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relações" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Abrir uma lista de de todas as relações." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relações: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Abrir um editor para a relação selecionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Excluir a relação selecionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Criar uma nova relação" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +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" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Seleção Atual" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Abrir uma janela de seleção." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Zoom para elementos selecionados" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Zoom para seleção." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Sel.: Rel.:{0} / Vias:{1} / Nós:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Seleção" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Seleção: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Desacoplar painel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Clique para minimizar/maximizar o conteúdo do painel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Autores" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Abrir lista de pessoas trabalhando nos objetos selecionados." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "Nº de objetos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "incompleto" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "via sem saída" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Baixando changeset abertos ..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5667,22 +5797,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Modificar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5691,5 +5821,5 @@ msgstr[1] "Modificar propriedades de até {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5698,227 +5828,71 @@ msgstr[1] "Isto modificará {0} objetos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Por favor, selecione uma chave" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Por favor, selecione um valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Por favor, selecione os objetos que deseja modificar propriedades." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Propriedades/Associações" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Propriedades dos objetos selecionados." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Adicionar Propriedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propriedades: {0} / Membros: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Propriedades / Associações" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Modificar relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Deletar da relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Confirmar a exclusão da relação {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Excluir a chave selecionada em todos objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Excluir Propriedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Adicionar um novo par chave/valor para todos objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Editar o valor da chave selecionada para todos objetos" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relações" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Abrir uma lista de de todas as relações." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relações: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Abrir um editor para a relação selecionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Excluir a relação selecionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Criar uma nova relação" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -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" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Seleção Atual" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Abrir uma janela de seleção." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Zoom para elementos selecionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Zoom para seleção." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Sel.: Rel.:{0} / Vias:{1} / Nós:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Seleção" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Seleção: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Desacoplar painel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Clique para minimizar/maximizar o conteúdo do painel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Autores" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Abrir lista de pessoas trabalhando nos objetos selecionados." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Mostrar informações" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Autor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "Nº de objetos" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5980,19 +5954,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Baixar todas vias imcompletas e nós desta relação" -msgstr[1] "Baixar todas vias imcompletas e nós desta relação" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Baixar membros do relaçoe" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Baixando relação {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -6010,14 +5983,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Aplicar papel" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Definir uma papel para membros selecionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -6026,14 +5997,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "Apagá-los, limpar relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 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:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -6043,9 +6014,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 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:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -6055,5 +6026,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -6062,5 +6033,5 @@ "membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -6069,5 +6040,5 @@ "membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -6077,5 +6048,5 @@ "membro selecionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -6085,20 +6056,20 @@ "membro selecionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "Editor de Relações: Remover Selecionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6107,70 +6078,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "Classificar a relação de membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Esportes" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "Editor de Relações: Classificar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "Editor de Relações: Mover para cima" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "Editor de Relações: Mover para Baixo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "Editor de Relações: Remover" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6179,9 +6149,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6190,49 +6160,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 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:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 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:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Adicionar uma tag vazia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Baixar membros do relaçoe" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Baixar membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "Editor de Relações: Baixar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "Baixar membros do relaçoe" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 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:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Aplicar papel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6242,34 +6210,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 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/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "Zoom para" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6381,10 +6349,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6394,5 +6362,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6478,9 +6446,4 @@ msgid "Download Area" msgstr "Baixar Área" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Baixar" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6781,6 +6744,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6793,6 +6754,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -7063,4 +7022,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7283,5 +7246,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7324,116 +7287,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Nome" @@ -7457,15 +7420,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Tipo" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7636,5 +7599,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" @@ -7642,6 +7605,6 @@ "referência." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7649,5 +7612,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7657,9 +7620,9 @@ "histórico" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "Histórico não inicializado ainda. Falha ao definir primitivo atual." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7775,6 +7738,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "Desconhecido" @@ -7796,13 +7759,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7837,4 +7800,135 @@ msgstr "Versão" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Sincronizar apenas o nó {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Sincronizar apenas o caminho {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Sincronizar apenas a relação {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synchronizar todo o conjunto de dados" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Envio falhou porque o servidor tem uma nova versão de " +"um
de seus nós, caminhos ou relações.
Este conflito é causado por " +"{0} com id {1},
o servidor tem a versão " +"{2}, e sua versão é {3}.

Clique {4} para sincronizar " +"somente a primitiva conflitante.
Clique {5} para " +"sincronizar todo o conjunto de dados locais no servidor
Clique {6}" +" para abortar e continuar editando.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Conflitos detectados" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Envio falhou porque o servidor tem uma nova versão de " +"um
de seus nós, caminhos ou relações..

Clique {0} para sincronizar todos o conjuntos de dados locais com o servidor." +"
Clique {1} para abortar e continuar editando.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"O envio falhou porque você está usando
o changeset " +"{0} que já foi fechado em {1}.
Por favor envie novamente em um changeset " +"novo ou aberto." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Changeset fechado" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "Preparar a resolução de conflitos" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "Clique para cancelar e voltar a editar o mapa" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" +"O envio de dados falhou porque você tentou apagar o " +"nó {0} que ainda é usado pela via {1}.

Clique {2} " +"para baixar todas as vias que contém o nó {0}.
Se for necessário o JOSM " +"criará conflitos que você poderá resolver através da Janela de Resolução de " +"Conflitos." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "Nó ainda em uso" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Faça um comentário breve sobre as mudanças que está enviando:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7853,39 +7947,148 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Enviar dados para um changeset aberto" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Enviar dados para um changeset aberto" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Enviar dados para um changeset aberto" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Salvar usuário e senha (sem encriptação)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Por favor entrar um nome" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Atenção: A senha é enviada sem encriptação." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Ativar" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Modificar relação" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7952,17 +8155,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7975,9 +8178,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7991,9 +8194,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -8008,50 +8211,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Descartar e Sair" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -8059,5 +8262,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -8130,40 +8333,382 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Enviar" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Atualiza objetos" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Configurações" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "pista_avançada" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Configurar o Aparelho" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "A enviar informação para a camada \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Enviar Modificações" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "A enviar informação para a camada \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Sobre" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Clique para cancelar a mesclagem de nós" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "{0} objecto a apagar:" +msgstr[1] "{0} objectos a apagar:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Changeset fechado" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Aviso: objeto \"{0}\" já foi apagado no servidor. Ignorando esse objeto e " +"tentando novamente o envio de dados." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" +"Objeto \"{0}\" já foi apagado. Ignorando esse objeto no envio de dados." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "Enviando {0} objetos..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" +"Ignorando exceção capturada porque o envio de dados foi cancelado. Exceção é " +"{0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Por favor, selecione a linha para apagar." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Objetos a adicionar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Objetos a modificar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Objetos a excluir:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8172,5 +8717,5 @@ msgstr[1] "{0} objectos a acrescentar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8179,5 +8724,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8186,210 +8731,37 @@ msgstr[1] "{0} objectos a apagar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Enviar Modificações" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Por favor, entre com as coordenadas desejadas primeiro." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Faça um comentário breve sobre as mudanças que está enviando:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Enviar dados para um changeset aberto" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Enviar dados para um changeset aberto" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "Requisição inválida" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} metros" -msgstr[1] "{0} metros" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Por favor digite um texto-filtro." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "ponto GPS" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Personalizar linha" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Usar preferências globais." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Desenhar linhas entre pontos para esta camada." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Não desenhar linhas entre pontos para esta camada." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Selecionar opções de linha" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8397,5 +8769,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8404,5 +8776,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8484,5 +8856,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Descrição" @@ -8514,10 +8886,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Converter para camada de dados" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8527,12 +8899,12 @@ "arriscado.
Se quiser enviar dados, consulte aqui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces (EN)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8541,29 +8913,29 @@ msgstr "Convertido de: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Descarregar do OSM ao largo desta via" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Descargar tudo entre:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Área máxima por pedio:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8574,9 +8946,9 @@ "Você deseja
continuar? " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Não há trilha GPX disponível na camada para associar áudio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8584,5 +8956,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8590,23 +8962,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Camada de dados {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "fora da área baixada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "versão {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Atenção: misturando dados de versões 0.6 e 0.5 na versão 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8615,5 +8987,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8627,5 +8999,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8638,11 +9010,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8651,36 +9023,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} consiste em:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "remover definição" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "Versão API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Converter para camada GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8688,5 +9060,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8695,5 +9067,5 @@ msgstr[1] "trilhas" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8701,5 +9073,5 @@ msgstr[1] "pontos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8708,5 +9080,5 @@ msgstr[1] "uma trilha com {0} pontos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8715,5 +9087,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8722,24 +9094,24 @@ msgstr[1] "{0} pontos" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Arcivo GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Erro enquanto analisava {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Não foi possível ler \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8748,34 +9120,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Sem data" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8783,69 +9155,154 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Data inválida" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +msgid "Override position for: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Deslocamento:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Todas as imagens" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Nada selecionado!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8854,9 +9311,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8865,134 +9318,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Valores Predefinidos" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Lendo {0}..." +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 +#, java-format +msgid "Unable to get canonical path for directory {0}\n" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 +#, java-format +msgid "Scanning directory {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 -#, java-format -msgid "Scanning directory {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 -#, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Imagens Geotagueadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -9000,52 +9375,99 @@ msgstr[1] "imagens" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Mover sempre e não mostrar dica outraves" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Arquivo não pode ser encontrado." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Nenhuma imagem" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Imagens Geotagueadas" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Anterior" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Tocar marcador prévio." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Pagina: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Remover foto da camada" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Deletar da relação" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Próximo" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +msgid "Show next Image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -9054,5 +9476,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9151,4 +9573,12 @@ msgid "Error displaying URL" msgstr "Erro exibindo a URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9373,7 +9803,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Tudo" @@ -9442,6 +9871,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Bicicleta" @@ -9828,30 +10257,89 @@ msgstr "A projeção {0} nâo pode ser ativada. Usando Mercator" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anônimo" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Albergue" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Porta:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Senha" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Configurações de Proxy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM senha" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." msgstr "" @@ -10132,5 +10620,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10140,13 +10628,13 @@ msgstr[1] "Remover chaves antigas de até {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10154,18 +10642,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Atributos opcionais:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "via sem saída" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Tipo desconhecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10176,16 +10664,16 @@ msgstr "Não foi possível ler a fonte de preferência de tags: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Erro analisando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementos do tipo {0} são suportados." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10194,18 +10682,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Nada selecionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Seleção inadequada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Aplicar Preferência" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Alterar propriedades" @@ -10234,4 +10722,11 @@ msgstr "Baixando pontos {0} a {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10247,12 +10742,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "Exceção NullPointerException, possivelmente faltam algumas tags." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Preparando dados..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "indice inesperado na coluna. Obtido {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10355,16 +10905,16 @@ msgstr "Erro de interpretação: estrutura inválida para documento gpx" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10374,40 +10924,40 @@ msgstr "Baixando dados OSM..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10415,10 +10965,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Baixando pontos {0} a {1}..." -msgstr[1] "Baixando pontos {0} a {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10455,14 +11005,14 @@ msgstr "falha na importação NMEA" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10471,16 +11021,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10488,66 +11038,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Fechando conjunto de mudanças..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Preparando..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Enviando..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Preparando dados..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Enviando {0} objetos..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "Changeset atual é nulo. Não há como enviar os dados." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10573,4 +11134,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10582,5 +11153,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10607,5 +11178,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10613,5 +11184,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10624,5 +11195,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10633,57 +11204,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Senha ou usuário incorreto." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Atenção: A senha é enviada sem encriptação." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Salvar usuário e senha (sem encriptação)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Digite a Senha" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Login" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM senha" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10773,5 +11293,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10780,38 +11307,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10819,19 +11346,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Especificação de incompleta com ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Objeto ilegal com id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10841,8 +11368,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10852,25 +11379,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "valor inesperado do parâmetro \"index\": {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10878,5 +11421,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10885,5 +11428,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10891,5 +11434,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10898,13 +11441,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Preparando dados OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10927,21 +11470,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Baixando changeset abertos ..." +msgstr[1] "Baixando changeset abertos ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Baixando changeset abertos ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10960,7 +11515,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "valor inesperado do parâmetro \"index\": {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10969,9 +11524,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11024,7 +11575,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "valor inesperado do parâmetro \"index\": {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 @@ -11032,12 +11583,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format msgid "({0}/{1}) Uploading {2} objects..." -msgstr "Enviando {0} objetos..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Primitivas deletadas ou movidas" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11079,7 +11635,7 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Apagar {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 @@ -11226,9 +11782,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "sem descrição disponível" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Mais detalhes" @@ -11360,4 +11916,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "valor inesperado do parâmetro \"index\": {0}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "parametro {0} > 0 necessário. Obtido {1}." + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11653,6 +12224,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Enviar Trilhas" @@ -11738,5 +12309,5 @@ msgstr "Enviar Trilha GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Enviar trilhas para openstreetmap.org" @@ -11747,5 +12318,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Interpolação de Endereços" @@ -11760,11 +12331,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Ímpar" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Par" @@ -11775,7 +12343,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Número" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position @@ -11786,12 +12353,10 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "Ativar" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Aluguel" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11809,7 +12374,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "segmento interno" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11922,5 +12486,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11982,21 +12546,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12005,13 +12569,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12036,17 +12600,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12058,18 +12622,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "WMS do cadastre Francese" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12077,5 +12641,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12083,9 +12647,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Permitir empilhamento de camadas múltiplas" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -12093,44 +12657,41 @@ "esquerda é mais transparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12332,5 +12893,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Localidade" @@ -12521,5 +13082,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Sem dados carregados." @@ -12541,9 +13102,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "EditGpx" @@ -12929,7 +13490,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "água" @@ -13078,19 +13639,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Conectando" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Conectado" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Não conectada" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Conexão falhou" @@ -13129,32 +13690,32 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 +msgid "Capture GPS Track" +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +msgid "Connect to gpsd server and show current position in LiveGPS layer." +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 +msgid "Center Once" +msgstr "" + #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 -msgid "Capture GPS Track" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -msgid "Connect to gpsd server and show current position in LiveGPS layer." -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 -msgid "Center Once" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 msgid "Center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13205,9 +13766,9 @@ msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Medições" @@ -13245,5 +13806,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13254,13 +13815,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13401,5 +13962,5 @@ msgstr "" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13491,5 +14052,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13565,41 +14126,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "imagen " @@ -13768,4 +14329,42 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Par" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Ruas" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +msgid " is not a number" +msgstr "" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13784,42 +14383,20 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolação" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Nome do rua" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Opcional" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13834,5 +14411,5 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "" @@ -14481,38 +15058,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "" @@ -14526,5 +15073,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "" @@ -14640,10 +15187,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15341,6 +15888,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Referência" @@ -15786,5 +16333,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Largura (metros)" @@ -15902,5 +16449,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15912,5 +16459,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "madeira" @@ -16168,4 +16715,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16197,8 +16747,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "sim" @@ -16346,9 +16898,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "não" @@ -16593,5 +17146,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "" @@ -16626,5 +17179,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "serviço" @@ -16658,6 +17211,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "construção" @@ -16707,5 +17260,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "rotatória" @@ -16893,6 +17446,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "" @@ -17013,5 +17566,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17037,4 +17589,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17044,15 +17597,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operador" @@ -17264,7 +17817,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Altitude" @@ -17683,5 +18236,5 @@ msgstr "" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17691,5 +18244,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "" @@ -18215,32 +18768,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Horário de Funcionamento" @@ -18299,91 +18852,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18398,5 +18951,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18415,7 +18968,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Número de Referência" @@ -18431,5 +18984,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "" @@ -18442,6 +18995,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Taxa" @@ -18480,22 +19033,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Loja" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Editar Loja de Carros" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Oficina" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Editar Oficina" @@ -18503,5 +19044,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Aluguel" @@ -18510,10 +19051,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Editar Aluguel de Carros" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Compartilhamento" @@ -18521,5 +19062,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Editar Compartilhamento de Carro" @@ -18527,10 +19068,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Editar Bicicletário" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "" @@ -18539,22 +19080,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Editar Aluguel de Bicicletas" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Editar Loja de Bicicletas" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Transporte Público" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18564,5 +19098,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18570,5 +19104,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18576,5 +19110,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -18582,5 +19116,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -18588,5 +19122,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Parada do Bonde/VLT" @@ -18595,5 +19129,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Editar Parada do Bonde/VLT" @@ -18601,5 +19135,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Plataforma de Trens" @@ -18608,5 +19142,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Editar Plataforma de Trens" @@ -18618,5 +19152,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18624,10 +19158,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Entrada do Metrô" @@ -18636,10 +19170,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Editar Entrada do Metrô" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -18648,5 +19182,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Terminal de Ônibus" @@ -18655,5 +19189,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Editar Terminal de Ônibus" @@ -18661,5 +19195,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Ponto de Ônibus" @@ -18669,5 +19203,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Editar Ponto de Ônibus" @@ -18676,17 +19210,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Abrigo" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Banco" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Plataforma de Ônibus" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Editar Plataforma de Ônibus" @@ -18694,5 +19236,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Táxi" @@ -18700,5 +19242,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Editar Ponto de Táxi" @@ -18706,5 +19248,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Aeroporto" @@ -18712,15 +19254,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Editar Aeroporto" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "" @@ -18728,10 +19270,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Viagem" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Acomodação" @@ -18743,5 +19285,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -18750,15 +19292,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "" @@ -18766,20 +19308,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Chalé" @@ -18787,10 +19329,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Editar Chalé" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Albergue" @@ -18798,30 +19340,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Editar Albergue" #. item "Travel/Accomodation/Hostel" text "Name" +#: build/trans_presets.java:1600 +msgid "Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" +#: build/trans_presets.java:1601 +msgid "Edit Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" text "Elevation" +#: build/trans_presets.java:1606 +msgid "Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" +#: build/trans_presets.java:1607 +msgid "Edit Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" text "Name" #: build/trans_presets.java:1611 -msgid "Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 -msgid "Edit Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 -msgid "Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 -msgid "Edit Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 msgid "Camping Site" msgstr "" @@ -18829,10 +19371,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Comida e Bebida" @@ -18843,5 +19385,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurante" @@ -18849,5 +19391,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Editar Restaurante" @@ -18855,5 +19397,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Cozinha" @@ -18861,61 +19403,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italiana" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "chinessa" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hambúrguer" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "grega" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "alemã" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indiana" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "regional" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turca" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asiática" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "tailandesa" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexicana" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japonesa" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Lanchonete" @@ -18923,9 +19465,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Editar Lanchonete Fast-Food" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Café" @@ -18933,9 +19475,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Editar Café" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Bar/Pub" @@ -18943,18 +19485,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Editar Bar/Pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "" @@ -18962,9 +19504,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Boate" @@ -18972,24 +19514,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Editar Boate" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turismo" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Atração" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Editar Atração Turística" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museu" @@ -18997,9 +19539,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Editar Museu" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoológico" @@ -19008,9 +19550,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Editar Zoológico" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Mirante" @@ -19018,24 +19560,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Editar Mirante" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Parque Temático" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Editar Parque Temático" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Arte" @@ -19043,5 +19585,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Editar Arte" @@ -19049,19 +19591,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Centro de Informações Turísticas" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Mapa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -19099,5 +19641,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19105,28 +19647,28 @@ msgstr "estrada" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -19136,5 +19678,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -19142,6 +19684,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "" @@ -19149,5 +19691,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19155,6 +19697,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "" @@ -19162,5 +19704,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19168,46 +19710,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "... outros modos de transporte possíveis" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Quadro de Informações" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "história" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "natureza" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "vida selvagem" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19215,29 +19757,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. -#: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 msgid "Phone number" msgstr "" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Outros Pontos de Informação" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Editar Abrigo" @@ -19245,25 +19787,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Lareira" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Campo de Picnic" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Editar Campo de Picnic" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Lugares Históricos" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Castelo" @@ -19272,19 +19814,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Editar Castelo" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruínas" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Editar Ruínas" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Sítio Arqueológico" @@ -19293,9 +19835,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Editar Sítio Arqueológico" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Campo de Batalha" @@ -19303,10 +19845,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Editar Campo de Batalha" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19314,5 +19856,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19320,15 +19862,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monumento" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Editar Monumento" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Memorial" @@ -19336,55 +19878,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Editar Memorial" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Cruz de beira de estrada" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Editar Cruz de beira de estrada" #. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" +#: build/trans_presets.java:1859 +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 msgid "Leisure" msgstr "Lazer" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Parque Aquático" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Editar Parque Aquático" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Parquinho" @@ -19392,35 +19934,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Editar Parquinho" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Pescaria" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Editar Pescaria" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Esportes" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Estádio" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Editar Estádio" @@ -19434,6 +19976,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "selecionar esporte:" @@ -19825,30 +20367,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "esporte" @@ -19858,225 +20400,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "multi" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "arco e flecha" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "atletismo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "futebol australiano" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basquete" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "boliche" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "canoagem" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "escalada" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "críquete" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "ciclismo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "corrida de cachorros" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "futebol americano" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golfe" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "ginástica olímpica" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hóquei" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "corrida de cavalos" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "automobilismo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "tiro" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "esqui" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "futebol" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "natação" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "ping-pong" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tênis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Centro de Esportes" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Editar Centro de Esportes" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Mini-Golf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Editar Mini-Golf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -20115,21 +20657,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "tipo" @@ -20168,203 +20710,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "estádio" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" +#: build/trans_presets.java:1942 +msgid "Edit 10pin" +msgstr "" + +#: build/trans_presets.java:1947 +msgid "Athletics" +msgstr "" + +#. item "Sport/Athletics" +#: build/trans_presets.java:1948 +msgid "Edit Athletics" +msgstr "" + #: build/trans_presets.java:1953 -msgid "Edit 10pin" -msgstr "" - -#: build/trans_presets.java:1958 -msgid "Athletics" -msgstr "" - -#. item "Sport/Athletics" +msgid "Archery" +msgstr "" + +#. item "Sport/Archery" +#: build/trans_presets.java:1954 +msgid "Edit Archery" +msgstr "" + #: build/trans_presets.java:1959 -msgid "Edit Athletics" -msgstr "" - -#: build/trans_presets.java:1964 -msgid "Archery" -msgstr "" - -#. item "Sport/Archery" +msgid "Climbing" +msgstr "" + +#. item "Sport/Climbing" +#: build/trans_presets.java:1960 +msgid "Edit Climbing" +msgstr "" + #: build/trans_presets.java:1965 -msgid "Edit Archery" -msgstr "" - -#: build/trans_presets.java:1970 -msgid "Climbing" -msgstr "" - -#. item "Sport/Climbing" -#: build/trans_presets.java:1971 -msgid "Edit Climbing" -msgstr "" - -#: build/trans_presets.java:1976 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" +#: build/trans_presets.java:1966 +msgid "Edit Canoeing" +msgstr "" + +#. item "Sport/Cycling" +#: build/trans_presets.java:1972 +msgid "Edit Cycling" +msgstr "" + #: build/trans_presets.java:1977 -msgid "Edit Canoeing" -msgstr "" - -#. item "Sport/Cycling" +msgid "Dog Racing" +msgstr "" + +#. item "Sport/Dog Racing" +#: build/trans_presets.java:1978 +msgid "Edit Dog Racing" +msgstr "" + #: build/trans_presets.java:1983 -msgid "Edit Cycling" -msgstr "" - -#: build/trans_presets.java:1988 -msgid "Dog Racing" -msgstr "" - -#. item "Sport/Dog Racing" +msgid "Equestrian" +msgstr "" + +#. item "Sport/Equestrian" +#: build/trans_presets.java:1984 +msgid "Edit Equestrian" +msgstr "" + #: build/trans_presets.java:1989 -msgid "Edit Dog Racing" -msgstr "" - -#: build/trans_presets.java:1994 -msgid "Equestrian" -msgstr "" - -#. item "Sport/Equestrian" +msgid "Horse Racing" +msgstr "" + +#. item "Sport/Horse Racing" +#: build/trans_presets.java:1990 +msgid "Edit Horse Racing" +msgstr "" + #: build/trans_presets.java:1995 -msgid "Edit Equestrian" -msgstr "" - -#: build/trans_presets.java:2000 -msgid "Horse Racing" -msgstr "" - -#. item "Sport/Horse Racing" +msgid "Gymnastics" +msgstr "" + +#. item "Sport/Gymnastics" +#: build/trans_presets.java:1996 +msgid "Edit Gymnastics" +msgstr "" + #: build/trans_presets.java:2001 -msgid "Edit Horse Racing" -msgstr "" - -#: build/trans_presets.java:2006 -msgid "Gymnastics" -msgstr "" - -#. item "Sport/Gymnastics" +msgid "Motor Sports" +msgstr "" + +#. item "Sport/Motor Sports" +#: build/trans_presets.java:2002 +msgid "Edit Motor Sports" +msgstr "" + #: build/trans_presets.java:2007 -msgid "Edit Gymnastics" -msgstr "" - -#: build/trans_presets.java:2012 -msgid "Motor Sports" -msgstr "" - -#. item "Sport/Motor Sports" +msgid "Skating" +msgstr "" + +#. item "Sport/Skating" +#: build/trans_presets.java:2008 +msgid "Edit Skating" +msgstr "" + #: build/trans_presets.java:2013 -msgid "Edit Motor Sports" -msgstr "" - -#: build/trans_presets.java:2018 -msgid "Skating" -msgstr "" - -#. item "Sport/Skating" +msgid "Skateboard" +msgstr "" + +#. item "Sport/Skateboard" +#: build/trans_presets.java:2014 +msgid "Edit Skateboard" +msgstr "" + #: build/trans_presets.java:2019 -msgid "Edit Skating" -msgstr "" - -#: build/trans_presets.java:2024 -msgid "Skateboard" -msgstr "" - -#. item "Sport/Skateboard" -#: build/trans_presets.java:2025 -msgid "Edit Skateboard" -msgstr "" - -#: build/trans_presets.java:2030 msgid "Swimming" msgstr "" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "" @@ -20372,56 +20914,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "" @@ -20429,182 +20971,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "" #. item "Sport (Ball)/Soccer" +#: build/trans_presets.java:2044 +msgid "Edit Soccer" +msgstr "" + +#: build/trans_presets.java:2049 +msgid "Football" +msgstr "" + +#. item "Sport (Ball)/Football" +#: build/trans_presets.java:2050 +msgid "Edit Football" +msgstr "" + #: build/trans_presets.java:2055 -msgid "Edit Soccer" -msgstr "" - -#: build/trans_presets.java:2060 -msgid "Football" -msgstr "" - -#. item "Sport (Ball)/Football" +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2056 +msgid "Edit Australian Football" +msgstr "" + #: build/trans_presets.java:2061 -msgid "Edit Football" -msgstr "" - -#: build/trans_presets.java:2066 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 -msgid "Edit Australian Football" -msgstr "" - -#: build/trans_presets.java:2072 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Editar Campo de Baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "" #. item "Sport (Ball)/Basketball" +#: build/trans_presets.java:2068 +msgid "Edit Basketball" +msgstr "" + +#: build/trans_presets.java:2073 +msgid "Golf" +msgstr "" + +#. item "Sport (Ball)/Golf" +#: build/trans_presets.java:2074 +msgid "Edit Golf" +msgstr "" + +#. item "Sport (Ball)/Golf" combo "type" +#: build/trans_presets.java:2077 +msgid "golf_course" +msgstr "" + #: build/trans_presets.java:2079 -msgid "Edit Basketball" -msgstr "" - -#: build/trans_presets.java:2084 -msgid "Golf" -msgstr "" - -#. item "Sport (Ball)/Golf" +msgid "Boule" +msgstr "" + +#. item "Sport (Ball)/Boule" +#: build/trans_presets.java:2080 +msgid "Edit Boule" +msgstr "" + #: build/trans_presets.java:2085 -msgid "Edit Golf" -msgstr "" - -#. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 -msgid "golf_course" -msgstr "" - -#: build/trans_presets.java:2090 -msgid "Boule" -msgstr "" - -#. item "Sport (Ball)/Boule" +msgid "Bowls" +msgstr "" + +#. item "Sport (Ball)/Bowls" +#: build/trans_presets.java:2086 +msgid "Edit Bowls" +msgstr "" + #: build/trans_presets.java:2091 -msgid "Edit Boule" -msgstr "" - -#: build/trans_presets.java:2096 -msgid "Bowls" -msgstr "" - -#. item "Sport (Ball)/Bowls" +msgid "Cricket" +msgstr "" + +#. item "Sport (Ball)/Cricket" +#: build/trans_presets.java:2092 +msgid "Edit Cricket" +msgstr "" + #: build/trans_presets.java:2097 -msgid "Edit Bowls" -msgstr "" - -#: build/trans_presets.java:2102 -msgid "Cricket" -msgstr "" - -#. item "Sport (Ball)/Cricket" +msgid "Cricket Nets" +msgstr "" + +#. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + #: build/trans_presets.java:2103 -msgid "Edit Cricket" -msgstr "" - -#: build/trans_presets.java:2108 -msgid "Cricket Nets" -msgstr "" - -#. item "Sport (Ball)/Cricket Nets" +msgid "Croquet" +msgstr "" + +#. item "Sport (Ball)/Croquet" +#: build/trans_presets.java:2104 +msgid "Edit Croquet" +msgstr "" + #: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 -msgid "Croquet" -msgstr "" - -#. item "Sport (Ball)/Croquet" +msgid "Hockey" +msgstr "" + +#. item "Sport (Ball)/Hockey" +#: build/trans_presets.java:2110 +msgid "Edit Hockey" +msgstr "" + #: build/trans_presets.java:2115 -msgid "Edit Croquet" -msgstr "" - -#: build/trans_presets.java:2120 -msgid "Hockey" -msgstr "" - -#. item "Sport (Ball)/Hockey" +msgid "Pelota" +msgstr "" + +#. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + #: build/trans_presets.java:2121 -msgid "Edit Hockey" -msgstr "" - -#: build/trans_presets.java:2126 -msgid "Pelota" -msgstr "" - -#. item "Sport (Ball)/Pelota" +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" +msgid "Rugby" +msgstr "" + +#. item "Sport (Ball)/Rugby" +#: build/trans_presets.java:2128 +msgid "Edit Rugby" +msgstr "" + #: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" +msgid "Table Tennis" +msgstr "" + +#. item "Sport (Ball)/Table Tennis" +#: build/trans_presets.java:2134 +msgid "Edit Table Tennis" +msgstr "" + #: build/trans_presets.java:2139 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2144 -msgid "Table Tennis" -msgstr "" - -#. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 -msgid "Edit Table Tennis" -msgstr "" - -#: build/trans_presets.java:2150 msgid "Tennis" msgstr "" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Construções" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "" @@ -20612,5 +21154,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Prédio Público" @@ -20618,10 +21160,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Editar Prédio Público" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Prefeitura" @@ -20629,10 +21171,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Editar Prefeitura" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Embaixada" @@ -20640,10 +21182,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Editar Embaixada" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Fórum" @@ -20652,10 +21194,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Editar Fórum" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Presídio" @@ -20664,10 +21206,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Editar Presídio" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Polícia" @@ -20677,10 +21219,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Editar Polícia" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Bombeiros" @@ -20689,10 +21231,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Editar Bombeiros" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Correios" @@ -20700,5 +21242,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Editar Correios" @@ -20706,15 +21248,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Creche" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Editar Creche" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Escola" @@ -20722,10 +21264,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Editar Escola" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Universidade" @@ -20733,10 +21275,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Editar Universidade" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Faculdade" @@ -20744,5 +21286,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Editar Faculdade" @@ -20750,5 +21292,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Cinema" @@ -20757,10 +21299,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Editar Cinema" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Biblioteca" @@ -20769,9 +21311,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Editar Biblioteca" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Centro de Artes" @@ -20779,10 +21321,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Editar Centro de Artes" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Teatro" @@ -20791,10 +21333,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Editar Teatro" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Lugar de Adoração" @@ -20804,5 +21346,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Editar Lugar de Adoração" @@ -20811,6 +21353,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "" @@ -20819,66 +21361,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "budismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "cristianismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hinduísmo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jainismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "judaísmo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "muçulmano" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikhismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "espiritismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoísmo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "unitarianismo" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrianismo" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Denominação" @@ -20887,81 +21429,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglicana" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "batista" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "católica" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangélica" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "testemunha de jeová" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "luterana" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "metodista" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mórmon" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "ortodoxa" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbiteriana" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestante" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "xiismo" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunismo" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Endereços" @@ -20970,5 +21512,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Editar Informações de Endereço" @@ -20976,5 +21518,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Número da casa" @@ -20982,20 +21524,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Nome da casa" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Nome do rua" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Cidade" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "CEP" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Código do país" @@ -21004,5 +21551,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Editar Interpolação de Endereços" @@ -21010,61 +21557,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Esquema de numeração" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "números ímpares" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "números pares" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "alfabético" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Fábrica" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Editar Fábrica" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Torre" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Editar Torre" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -21072,25 +21619,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Torre de Água" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Editar Torre de Água" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gasômetro" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Editar Gasômetro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Farol" @@ -21098,10 +21645,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Editar Farol" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Moinho de Vento" @@ -21109,10 +21656,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Editar Moinho de Vento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Cano" @@ -21121,37 +21668,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Editar Cano" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gás" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "subaquático" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Estação de Tratamento de Esgoto" @@ -21161,10 +21708,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Editar Estação de Tratamento de Esgoto" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Guindaste" @@ -21172,10 +21719,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Editar Guindaste" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "" @@ -21183,10 +21730,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Vértice Geodésico" @@ -21194,10 +21741,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Editar Vértice Geodésico" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Câmera de Vigilância" @@ -21205,5 +21752,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Editar Câmera de Vigilância" @@ -21211,5 +21758,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Gerador de Energia" @@ -21219,35 +21766,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Editar Gerador de Energia" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "eólica" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "hidrelétrica" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fóssil" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "carvão" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Estação de Energia" @@ -21256,10 +21803,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Editar Estação de Energia" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Subestação de Energia" @@ -21268,5 +21815,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Editar Subestação de Energia" @@ -21274,10 +21821,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Torre de Energia" @@ -21288,23 +21835,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Editar Torre de Energia" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Linha de transmissão" @@ -21313,75 +21860,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Editar Linha de Transmissão" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Voltagem" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Comodidades" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Banheiros" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Caixa de Correio" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefone" @@ -21390,5 +21937,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Editar Telefone" @@ -21396,5 +21943,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Moedas" @@ -21402,5 +21949,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Notas" @@ -21408,5 +21955,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21414,5 +21961,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "" @@ -21420,15 +21967,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Cartão de Crédito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Cartão Telefônico" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Reciclagem" @@ -21437,5 +21984,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "" @@ -21443,68 +21990,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Baterias" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Latas" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Roupas" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Vidro" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papel" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Ferro Velho" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Banco" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21575,39 +22117,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "" @@ -21616,30 +22158,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Altura" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "baixa" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Chafariz" @@ -21648,10 +22190,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Editar Chafariz" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Bebedouro" @@ -21660,10 +22202,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Editar Bebedouro" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21671,33 +22213,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Lojas" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Editar Loja de Carros" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Editar Loja de Bicicletas" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermercado" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Editar Supermercado" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Loja de Conveniência" @@ -21705,9 +22271,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Editar Loja de Conveniência" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Quiosque" @@ -21715,27 +22281,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Editar Quiosque" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Agência de Viagem" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Editar Agência de Viagem" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "" @@ -21743,5 +22309,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Editar Máquina de Vendas" @@ -21749,88 +22315,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Produtos à venda" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "tíquetes de transporte público" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "mapas de transporte público" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "tíquetes de estacionamento" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "comida" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "bebidas" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "doces" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "cigarros" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "fotos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "ração animal" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "jornais" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "brinquedos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "selos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "Cartões SIM" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "preservativos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "absorventes" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "sacos para fezes" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Cartões de fidelidade" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Açougue" @@ -21838,9 +22404,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Editar Açougue" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Padaria" @@ -21848,9 +22414,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Editar Padaria" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Floricultura" @@ -21858,18 +22424,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Editar Floricultura" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Orgânicos" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Editar Loja de Orgânicos" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Álcool" @@ -21877,54 +22443,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Bebidas" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Editar Loja de Bebidas" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Computador" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Editar Loja de Computador" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Eletrônicos" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Editar Loja de Eletrônicos" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Equipamentos de Áudio" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Editar Loja de Equipamentos de Áudio" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Móveis" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Editar Loja de Móveis" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Loja de Plantas" @@ -21932,9 +22498,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Editar Loja de Plantas" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21942,9 +22508,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Editar Loja de Utilidades Domésticas" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "" @@ -21952,54 +22518,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Papelaria" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Editar Papelaria" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Cabelereiro" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Editar Cabelereiro" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Sapatos" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Editar Loja de Sapatos" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Brinquedos" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Editar Loja de Brinquedos" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Locadora de Vídeo" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Editar Locadora de Vídeo" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Lavanderia à Seco" @@ -22007,9 +22573,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Editar Lavanderia à Seco" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Lavanderia" @@ -22017,9 +22583,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Editar Lavanderia" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "" @@ -22027,28 +22593,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Editar Loja de Esportes" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Óculos" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Editar Loja de Óculos" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Dinheiro" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banco" @@ -22056,14 +22622,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Editar Banco" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Caixa Eletrônico" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Loja de Câmbio" @@ -22071,5 +22637,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Editar Loja de Câmbio" @@ -22077,15 +22643,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Editar Caixa Eletrônico" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Saúde" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Médicos" @@ -22093,18 +22659,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Editar Médicos" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Dentistas" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Editar Dentistas" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Farmácia" @@ -22112,5 +22678,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Editar Farmácia" @@ -22118,9 +22684,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Hospital" @@ -22128,10 +22694,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Editar Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Entrada de Emergência" @@ -22140,5 +22706,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Editar Entrada de Emergência" @@ -22147,20 +22713,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Número de telefone" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Use código internacional, como +12-345-67890)" @@ -22168,5 +22734,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Veterinária" @@ -22175,64 +22741,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Editar Veterinária" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "Geografia" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Lugares" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Continente" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Editar Continente" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "País" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Editar País" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Estado" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Editar Estado" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Região" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Editar Região" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Condado" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Editar Condado" @@ -22240,15 +22806,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Cidade" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Editar Cidade (mais que 100 mil habitantes)" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Cidade (menos que 100 mil habitantes)" @@ -22256,10 +22822,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Editar Cidade (menos que 100 mil habitantes)" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Bairro" @@ -22267,25 +22833,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Editar Bairro" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Vilarejo" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Editar Vilarejo" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "" @@ -22293,5 +22859,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "" @@ -22299,10 +22865,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Ilha" @@ -22310,10 +22876,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Editar Ilha" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22321,5 +22887,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22327,5 +22893,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Entrada de Caverna" @@ -22333,10 +22899,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Editar Entrada de Caverna" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Pico" @@ -22344,10 +22910,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Editar Pico" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Geleira" @@ -22355,10 +22921,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Editar Geleira" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Vulcão" @@ -22366,70 +22932,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Editar Vulcão" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Fronteiras" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Nacional" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Editar Fronteiras Nacionais" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administrativo" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Editar Fronteiras Administrativas" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Civil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Editar Fronteiras Civis" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Político" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Editar Fronteiras Políticas" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Parque nacional" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Editar Fronteira de Parque Nacional" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Uso da terra" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Árvore" @@ -22438,15 +23004,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Editar Árvore" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Nome Botânico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Floresta" @@ -22455,5 +23021,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Editar Floresta" @@ -22461,17 +23027,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "conífera" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "decídua" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "misturado" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Floresta" @@ -22480,14 +23046,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Reserva Natural" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Editar Reserva Natural" @@ -22495,25 +23061,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Arbusto" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Editar arbusto" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22521,10 +23087,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Editar rocha" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Matagal" @@ -22532,5 +23098,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Editar matagal" @@ -22538,5 +23104,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "" @@ -22545,45 +23111,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "" @@ -22591,25 +23157,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Jardim" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Editar Jardim" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22617,10 +23183,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22628,20 +23194,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Parque" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Editar Parque" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "área de recreação" @@ -22649,5 +23215,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -22655,15 +23221,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Área residencial" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Cemitério" @@ -22671,9 +23237,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Editar Cemitério" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Cemitério" @@ -22681,39 +23247,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Comercial" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Industrial" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "" @@ -22721,15 +23287,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militar" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "" @@ -22737,55 +23303,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Área de construção" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Pedreira" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multipolígono" @@ -22795,5 +23361,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Editar Multipolígono" @@ -22802,10 +23368,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "segmento externo" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "segmento interno" @@ -22813,5 +23379,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Restrição de manobra" @@ -22820,5 +23386,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Editar restrição de manobras" @@ -22826,34 +23392,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Restrição" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "proibida_conversão_esquerda" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "proibida_conversão_direita" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "proibido_em_frente" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "proibido_retornar" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "somente_a_direita" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "somente_a_esquerda" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "somente_em_frente" @@ -22862,15 +23428,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "do caminho" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "nó de via ou caminho" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "para caminho" @@ -22878,5 +23444,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22885,5 +23451,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22891,5 +23457,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Tipo de rota" @@ -22961,24 +23527,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "ônibus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "estrada" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "Ferry" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "Esqui" @@ -23031,5 +23597,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23038,13 +23604,13 @@ msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "caminhada" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "bonde/VLT" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "desvio" @@ -23058,10 +23624,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "Metrô" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Descrição de símbolo" @@ -23069,31 +23635,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "Proposto" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "alternativa" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "temporário" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Cor (hex)" @@ -23102,30 +23668,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "segmento de rota" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "segmento em frente" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "Ponto de parada" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "ponto de parada em frente" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "ponto de parada atrás" @@ -23336,130 +23902,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23476,98 +23916,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "depreciado" @@ -23944,7 +24293,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "trilha_autoestrada" @@ -24008,13 +24357,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "trilho" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24030,5 +24458,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -24042,5 +24470,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -24061,5 +24489,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "rótula" @@ -24074,5 +24502,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -24087,5 +24515,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "margem de rio" @@ -24099,5 +24527,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "fluxo" @@ -24111,5 +24539,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "doca" @@ -24131,16 +24559,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "aqueduto" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24237,4 +24653,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24303,13 +24726,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24355,6 +24778,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24371,7 +24794,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "ponto de ferrovia" @@ -24394,10 +24817,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24433,11 +24856,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24478,6 +24902,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "aerovia" @@ -24491,5 +24915,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -24511,5 +24935,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "aerovia_escuro" @@ -24523,5 +24947,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "aerovia_claro" @@ -24529,4 +24953,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24576,7 +25007,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "" @@ -24593,5 +25024,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "pista_fácil" @@ -24606,5 +25037,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "pista_intermediária" @@ -24619,5 +25050,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "pista_avançada" @@ -24632,5 +25063,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24645,5 +25076,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "pista_livre" @@ -24658,5 +25089,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "pista_novatos" @@ -24776,11 +25207,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "energia" @@ -24794,5 +25225,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "pier" @@ -24806,5 +25237,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "canalização" @@ -24932,12 +25363,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "lazer" @@ -24951,5 +25399,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "marina" @@ -24987,4 +25435,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25003,4 +25467,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25021,8 +25493,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -25124,10 +25598,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25381,5 +25855,5 @@ #. #. -#. +#. #. color health #. @@ -25525,4 +25999,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25542,23 +26024,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25590,6 +26072,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25650,14 +26132,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "saúde" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26004,5 +26486,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26025,5 +26506,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "loja" @@ -26095,8 +26577,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotel" @@ -26197,9 +26679,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turismo" @@ -26287,9 +26769,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "histórico" @@ -26303,5 +26785,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "" @@ -26315,5 +26797,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "aterro" @@ -26335,5 +26817,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "" @@ -26347,5 +26829,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "floresta" @@ -26359,5 +26841,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "fazenda" @@ -26380,5 +26862,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "venda" @@ -26392,5 +26874,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "industrial" @@ -26404,5 +26886,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "Área contaminada" @@ -26416,5 +26898,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "campo" @@ -26428,5 +26910,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26483,7 +26965,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "exército" @@ -26497,5 +26979,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "Cemitério" @@ -26508,5 +26990,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "cume" @@ -26521,5 +27003,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "geleira" @@ -26533,5 +27015,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "vulcão" @@ -26586,8 +27068,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26601,5 +27083,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "arbusto" @@ -26613,5 +27095,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "" @@ -26625,5 +27107,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26637,5 +27119,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "lama" @@ -26649,5 +27131,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "praia" @@ -26725,8 +27207,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "rota" @@ -26774,7 +27256,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "limite" @@ -26924,11 +27406,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "lugar" @@ -26976,6 +27458,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "endereço" @@ -27331,67 +27813,55 @@ msgstr "" +#~ msgid "Updating primitive" +#~ msgstr "Atualizando primitiva" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Fechamento de parenteses esperado." + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Não é possível desfazer comando \"{0}\" porque a camada \"{1}\" não está " -#~ "mais presente" - -#~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" -#~ msgstr "" -#~ "Habilitar para envio de todas modificações em uma chamada, desabilitar " -#~ "para usar uma chamada por primitiva" - -#~ msgid "Images for {0}" -#~ msgstr "Imagens para {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Ler GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Sem tempo para ponto {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Não foi possível ler tempo \"{0}\" para ponto {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Não foram encontradas imagens com dados de tempo legíveis" - -#~ msgid "GPS start: {0}" -#~ msgstr "Iniciar GPS: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "Finalizar GPS: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "delta atual: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "diferença de zona horária: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} dentro da faixa" - -#~ msgid "Sync clock" -#~ msgstr "Sincronizar relógio" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "A data no arquivo \"{0}\" não pode ser analisada." - -#~ msgid "Image" -#~ msgstr "Imagem" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Zona horária do GPS (diferença com foto)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Sincronizar Tempo com Unidade GPS" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "O tempo informado não pode ser analisado." +#~ "O número de alterações atuais ultrapassa o número máximo de alterações. O " +#~ "número atual é {0}, o máximo é {1}" + +#~ msgid "All images" +#~ msgstr "Todas as imagens" + +#~ msgid "Default Values" +#~ msgstr "Valores Predefinidos" + +#~ msgid "Anonymous" +#~ msgstr "Anônimo" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "Exceção NullPointerException, possivelmente faltam algumas tags." + +#~ msgid "Preparing..." +#~ msgstr "Preparando..." + +#~ msgid "Uploading..." +#~ msgstr "Enviando..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Senha ou usuário incorreto." + +#~ msgid "Enter Password" +#~ msgstr "Digite a Senha" + +#~ msgid "Login" +#~ msgstr "Login" + +#~ msgid "Interpolation" +#~ msgstr "Interpolação" + +#~ msgid "Optional" +#~ msgstr "Opcional" + +#~ msgid "Shop" +#~ msgstr "Loja" + +#~ msgid "aqueduct" +#~ msgstr "aqueduto" #~ msgid "Unknown version" @@ -27579,7 +28049,4 @@ #~ msgstr "Combinar conflitos" -#~ msgid "File could not be found." -#~ msgstr "Arquivo não pode ser encontrado." - #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "Alguns dos nós estão (praticamente) na linha" @@ -27682,4 +28149,13 @@ #~ msgid "File not found" #~ msgstr "Arquivo não encontrado" + +#~ msgid "Images for {0}" +#~ msgstr "Imagens para {0}" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Sincronizar Tempo com Unidade GPS" + +#~ msgid "Image" +#~ msgstr "Imagem" #~ msgid "" @@ -27841,4 +28317,7 @@ #~ msgstr "Historia do iten" +#~ msgid "Read GPX..." +#~ msgstr "Ler GPX..." + #~ msgid "Copy defaults" #~ msgstr "Copiar padrões" @@ -27850,6 +28329,15 @@ #~ msgstr "Continuar assim mesmo" +#~ msgid "Sync clock" +#~ msgstr "Sincronizar relógio" + #~ msgid "Remove relation member {0} {1}" #~ msgstr "Apagar membro de relação {0}{1}" + +#~ msgid "{0} within the track." +#~ msgstr "{0} dentro da faixa" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "A data no arquivo \"{0}\" não pode ser analisada." #~ msgid "Edit Station" @@ -27890,4 +28378,34 @@ #~ msgstr "Vinculado" +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Sem tempo para ponto {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Não foi possível ler tempo \"{0}\" para ponto {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Não foram encontradas imagens com dados de tempo legíveis" + +#~ msgid "GPS start: {0}" +#~ msgstr "Iniciar GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "delta atual: {0}s" + +#~ msgid "GPS end: {0}" +#~ msgstr "Finalizar GPS: {0}" + +#~ msgid "timezone difference: " +#~ msgstr "diferença de zona horária: " + +#~ msgid "Time entered could not be parsed." +#~ msgstr "O tempo informado não pode ser analisado." + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Zona horária do GPS (diferença com foto)" + #~ msgid "" #~ "Failed to access system property ''{0}'' for security reasons. Exception " @@ -27897,4 +28415,11 @@ #~ "Exceção foi: {1}" +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Habilitar para envio de todas modificações em uma chamada, desabilitar " +#~ "para usar uma chamada por primitiva" + #~ msgid "Delete all" #~ msgstr "Apagar tudo" @@ -27917,4 +28442,10 @@ #~ "\">português." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Não é possível desfazer comando \"{0}\" porque a camada \"{1}\" não está " +#~ "mais presente" + #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset." Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 19198) +++ /applications/editors/josm/i18n/po/ro.po (revision 19199) @@ -4,11 +4,12 @@ # FIRST AUTHOR , YEAR. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-29 22:15+0000\n" -"Last-Translator: Cezar Radu-Buterez \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-10 21:24+0000\n" +"Last-Translator: Adi Roiban \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" @@ -17,5 +18,5 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:29+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -23,35 +24,35 @@ "X-Poedit-SourceCharset: utf-8\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Se creează interfața grafică" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "_Ajutor" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Se ignoră URL-ul prost format: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -63,21 +64,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -98,17 +99,8 @@ msgstr "Avertisment" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Se ingoră fişierul URL prost format: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -116,8 +108,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,10 +126,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -140,9 +141,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -151,6 +153,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -205,8 +207,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -274,5 +276,5 @@ msgstr "Despre JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -281,5 +283,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -288,5 +290,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -295,15 +297,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Continuă" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -312,29 +319,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -351,5 +359,9 @@ msgstr "Anulează" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -367,5 +379,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Fuzionează" @@ -383,15 +395,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Adaugă Nod..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Adaugă un nod prin introducerea latitudinii şi longitudinii" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -407,22 +419,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Editează: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Introdu coordonatele pentru noul nod." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Foloseşte grade zecimale" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valorile negative denotă emisfera Vestică/Sudică" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -431,5 +443,5 @@ msgstr "Latitudine" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -438,28 +450,29 @@ msgstr "Longitudine" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -471,9 +484,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -494,18 +507,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -517,5 +530,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -537,6 +550,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -583,5 +596,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflict" @@ -618,14 +631,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -635,21 +649,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -msgid "There are no open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "" @@ -734,11 +748,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -816,16 +831,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -861,5 +881,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplicare" @@ -902,10 +922,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Exportă ca GPX" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Exportă datele într-un fişier GPX." @@ -920,12 +940,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -950,8 +970,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -962,10 +982,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -978,17 +998,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1025,22 +1045,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Selectează te rog cel puţin două căi pentru a le combina." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1050,38 +1075,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1089,33 +1110,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Introdu valori pentru toate conflictele." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Rezolvă Conflictele" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1278,5 +1299,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Nu pot muta obiecte în afara lumii." @@ -1356,28 +1377,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1386,9 +1407,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1397,15 +1418,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" msgstr "" @@ -1479,18 +1500,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Selectează te rog cel puțin o cale." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "" @@ -1499,10 +1520,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Salvează" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Salvează datele curente." @@ -1559,10 +1580,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Salvează datele curente într-un fişier nou." @@ -1603,6 +1624,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1634,5 +1654,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1691,5 +1711,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1697,5 +1717,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1703,5 +1723,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1735,43 +1755,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +msgid "Select either:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 -msgid "Select either:" +msgid "* One tagged node, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 -msgid "* One tagged node, or" +msgid "* One node that is used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "* One node that is used by more than one way, or" +msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1781,9 +1801,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1791,5 +1811,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1824,10 +1844,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Actualizează datele" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1835,53 +1855,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1890,5 +1906,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1896,131 +1912,7 @@ msgstr "Nu sunt schimbări de transmis." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nimic de transmis. Mai întâi obţineţi nişte date." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2155,9 +2047,9 @@ msgstr "Descarcă date GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Descarc date" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2165,5 +2057,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2234,7 +2126,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2249,58 +2141,52 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "selectat" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Adaugă nod" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Adaugă nod nou la o cale existentă" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Creează nod nou" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2309,14 +2195,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "" @@ -2355,18 +2241,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Selectaţi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2375,17 +2262,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2395,22 +2282,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2420,5 +2307,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Apropie" @@ -2440,5 +2327,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Caută obiecte" @@ -2534,8 +2421,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2543,45 +2438,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2589,55 +2490,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Căutare" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2647,40 +2548,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +msgid "Missing parameter for OR" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +msgid "Missing right parent" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +msgid "Missing operator for NOT" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2689,9 +2590,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2700,7 +2601,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2734,17 +2640,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 -msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 #, java-format msgid "" @@ -2752,5 +2646,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 #, java-format msgid "" @@ -2759,11 +2653,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgid "API Capabilities Violation" msgstr "" @@ -2877,5 +2775,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2890,5 +2788,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -2987,4 +2885,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3096,5 +3009,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3176,15 +3089,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3193,5 +3106,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3200,5 +3113,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3207,5 +3120,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3214,5 +3127,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3220,5 +3133,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3227,5 +3140,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3234,5 +3147,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3241,5 +3154,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3248,10 +3161,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3259,24 +3172,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3285,5 +3198,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3312,5 +3225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3332,31 +3245,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3364,5 +3270,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3373,27 +3279,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3401,5 +3307,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3411,5 +3317,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3417,25 +3323,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3443,43 +3349,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3487,5 +3405,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3513,10 +3431,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3524,7 +3438,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3539,5 +3453,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3555,146 +3469,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "selectat" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3704,6 +3610,6 @@ msgstr[2] "de noduri" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3713,7 +3619,8 @@ msgstr[2] "de căi" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3722,20 +3629,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "cale incompletă" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "fundal" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" +msgstr "" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" msgstr "" @@ -3878,5 +3801,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "" @@ -3892,7 +3815,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3908,4 +3831,10 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3937,6 +3866,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Conflict" @@ -3950,7 +3879,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4029,74 +3958,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nume utilizator" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Parolă" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "utilizare" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "opţiuni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Arată acest ajutor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Argument geometrie unix standard" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Descarcă perimetrul selectat" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Descarcă perimetrul selectat ca date gps neprelucrate" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Selectează cu căutarea dată" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Restabileşte preferinţele implicite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4105,9 +4034,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "exemple" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4118,36 +4047,36 @@ "că aţi încărcat date înainte de --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "În loc de --download= puteţi specifica osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4162,22 +4091,22 @@ msgstr "Editare" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Vizualizare" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Unelte" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4185,5 +4114,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "" @@ -4262,13 +4191,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "stratul nu este în listă." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4301,5 +4231,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4307,6 +4237,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4315,5 +4245,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4322,5 +4252,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4329,25 +4259,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4355,9 +4285,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4389,11 +4319,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4402,6 +4332,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4409,6 +4339,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4416,40 +4346,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4457,21 +4387,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4503,22 +4433,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4526,5 +4456,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4532,30 +4462,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4563,5 +4493,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4569,14 +4499,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4584,5 +4514,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4590,23 +4520,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4617,27 +4547,27 @@ msgstr "Elimină" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4646,5 +4576,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4653,5 +4583,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4660,5 +4590,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4667,5 +4597,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4674,5 +4604,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4682,5 +4612,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4915,10 +4845,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4928,10 +4858,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5016,9 +4946,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5026,6 +4956,6 @@ msgstr "nici unul" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "" @@ -5114,7 +5044,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5124,6 +5054,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5231,4 +5161,55 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Șterge obiectele selectate." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Schimb valorile?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Descarcă hărţi de la serverul OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Șterge obiectele selectate." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +msgid "Open a web page for each selected changeset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5242,12 +5223,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5265,13 +5246,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Rezolvă" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5279,6 +5260,6 @@ "mai sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5288,25 +5269,25 @@ "mai sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5318,26 +5299,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5348,41 +5329,41 @@ msgstr "Adaugă" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5421,5 +5402,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5434,34 +5415,34 @@ msgstr "Deschide o listă cu toate straturile încărcate." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Şterge stratul selectat." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Arată/Ascunde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Comută starea vizibilă a stratului selectat." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Mută stratul selectat un rând în sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Mută stratul selectat un rând în jos." @@ -5471,5 +5452,174 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Selecţia curentă" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Deschide o fereastra cu o listă de selecţie." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Selecţie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "incomplet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Descarc date" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5478,22 +5628,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Schimb valorile?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5502,5 +5652,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5509,227 +5659,72 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Vă rog selectaţi o cheie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Vă rog selectaţi o valoare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "" "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Şterge cheia selectată din toate obiectele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Editează valoarea cheii selectata pentru toate obiectele" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Selecţia curentă" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Deschide o fereastra cu o listă de selecţie." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Selecţie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5796,10 +5791,8 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Descarc date" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5829,5 +5822,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5836,14 +5829,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5853,9 +5846,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5865,15 +5858,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5881,5 +5874,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5887,20 +5880,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5909,69 +5902,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5980,9 +5973,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -5991,47 +5984,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6041,34 +6034,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6180,10 +6173,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6193,5 +6186,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6274,9 +6267,4 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:124 msgid "Download Area" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" msgstr "" @@ -6576,6 +6564,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6588,6 +6574,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6858,4 +6842,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7078,5 +7066,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7119,116 +7107,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Nume" @@ -7252,15 +7240,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7431,10 +7419,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7442,5 +7430,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7448,9 +7436,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7565,6 +7553,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "necunoscut" @@ -7586,13 +7574,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7627,4 +7615,116 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7643,39 +7743,142 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +msgid "Upload to a new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +msgid "Upload to an existing changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Salvează nume utilizator şi parolă (necriptate)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +msgid "Please enter the user name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Atenţie: Parola este transferată necriptată." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +msgid "Authenticate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +msgid "Cancel authentication" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7742,17 +7945,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7765,9 +7968,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7781,9 +7984,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7798,50 +8001,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Renunţ şi Ies" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7849,5 +8052,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7920,40 +8123,378 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "Advanced" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +msgid "Configure advanced settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Despre JOSM..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Despre" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Atenție: obiectul „{0}” este deja șters de pe server. Se omite acest obiect " +"și se reîncearcă o reîncărcare." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Vă rog selectaţi rândul care va fi şters." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Obiecte de adăugat:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Obiecte de modificat:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Obiecte de şters:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7962,5 +8503,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -7969,5 +8510,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -7976,209 +8517,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Vă rog întâi introduceţi coordonatele dorite." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Vă rog introduceţi un şir de căutat" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "punct gps" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Personalizează trasarea liniilor" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Utilizează opţiunile globale." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Trasează linii între puncte pentru acest strat." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Nu trasa linii între puncte pentru acest strat." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Selectaţi opţiunile pentru trasarea liniilor" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8186,5 +8555,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8193,5 +8562,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8273,5 +8642,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "" @@ -8303,10 +8672,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Converteşte la strat de date" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8314,12 +8683,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8328,29 +8697,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8359,9 +8728,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8369,5 +8738,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8375,23 +8744,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8400,5 +8769,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8412,5 +8781,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8423,11 +8792,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8436,36 +8805,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} constă în:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8473,5 +8842,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8480,5 +8849,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8487,5 +8856,5 @@ msgstr[2] "de puncte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8495,5 +8864,5 @@ msgstr[2] "o urmă cu {0} de puncte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8503,5 +8872,5 @@ msgstr[2] "{0} este format din {1} de urme" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8511,24 +8880,24 @@ msgstr[2] "{0} de puncte" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Eroare la prelucrarea {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Nu am putut citi \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8537,34 +8906,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8572,69 +8941,154 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +msgid "Override position for: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "selectat" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8643,9 +9097,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8654,134 +9104,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Citesc {0}..." +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 +#, java-format +msgid "Unable to get canonical path for directory {0}\n" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 +#, java-format +msgid "Scanning directory {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 -#, java-format -msgid "Scanning directory {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 -#, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Imagini geoetichetate" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8790,52 +9162,96 @@ msgstr[2] "de imagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Fişierul nu a putut fi găsit." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Imagini geoetichetate" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +msgid "Show previous Image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Vedere: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +msgid "Delete File from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +msgid "Show next Image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8844,5 +9260,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8936,4 +9352,12 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "Error displaying URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" msgstr "" @@ -9147,7 +9571,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "" @@ -9216,6 +9639,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "" @@ -9604,30 +10027,89 @@ msgstr "Proiecția {0} nu a putut fi activată. Se folosește Mercator." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +msgid "Host:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +msgctxt "server" +msgid "Port:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Parolă" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Parolă de autentificare pentru contul OSM. Lăsaţi gol pentru a nu păstra " +"nici o parolă." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Adresă server principal" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "Parola OSM" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." msgstr "" @@ -9908,5 +10390,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9916,13 +10398,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9930,18 +10412,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9952,16 +10434,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Eroare la prelucrarea {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -9971,18 +10453,18 @@ msgstr[2] "Schimb {0} de obiecte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Modificare proprietăţi" @@ -10011,4 +10493,11 @@ msgstr "Descarc punctele {0} până la {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10024,12 +10513,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Pregătesc datele..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10128,16 +10672,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10147,40 +10691,40 @@ msgstr "Descarc datele OSM..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10188,11 +10732,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Descarc punctele {0} până la {1}..." -msgstr[1] "Descarc punctele {0} până la {1}..." -msgstr[2] "Descarc punctele {0} până la {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10229,14 +10772,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10245,16 +10788,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10262,66 +10805,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "" - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Pregătesc datele..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Schimb {0} obiect" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10347,4 +10901,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10356,5 +10920,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10381,5 +10945,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10387,5 +10951,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10398,5 +10962,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10407,59 +10971,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Parolă sau nume utilizator incorecte." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Atenţie: Parola este transferată necriptată." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Salvează nume utilizator şi parolă (necriptate)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Introduceţi parola" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Parolă de autentificare pentru contul OSM. Lăsaţi gol pentru a nu păstra " -"nici o parolă." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Adresă server principal" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "Parola OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10549,5 +11060,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10556,38 +11074,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10595,19 +11113,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Obiect ilegal cu id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10617,8 +11135,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10628,25 +11146,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10654,5 +11188,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10661,5 +11195,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10667,5 +11201,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10674,13 +11208,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10703,21 +11237,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Descarc datele OSM..." +msgstr[1] "Descarc datele OSM..." +msgstr[2] "Descarc datele OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Descarc punctele {0} până la {1}..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10745,9 +11292,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10806,5 +11349,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10813,4 +11356,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +msgid "Unexpected id 0 for osm primitive found" msgstr "" @@ -10991,9 +11538,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11115,4 +11662,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11395,6 +11957,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "" @@ -11480,5 +12042,5 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "" @@ -11489,5 +12051,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "" @@ -11502,11 +12064,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11527,7 +12086,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "imagine" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 @@ -11661,5 +12219,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11721,21 +12279,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11744,13 +12302,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11775,17 +12333,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11797,18 +12355,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11816,5 +12374,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11822,52 +12380,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12069,5 +12624,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12258,5 +12813,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "" @@ -12278,9 +12833,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12666,7 +13221,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "" @@ -12815,19 +13370,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "" @@ -12866,32 +13421,32 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 +msgid "Capture GPS Track" +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +msgid "Connect to gpsd server and show current position in LiveGPS layer." +msgstr "" + +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 +msgid "Center Once" +msgstr "" + #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 -msgid "Capture GPS Track" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -msgid "Connect to gpsd server and show current position in LiveGPS layer." -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 -msgid "Center Once" -msgstr "" - -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 msgid "Center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "" @@ -12942,9 +13497,9 @@ msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "" @@ -12982,5 +13537,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -12991,13 +13546,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13138,5 +13693,5 @@ msgstr "" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13228,5 +13783,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13302,41 +13857,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13505,4 +14060,40 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +msgid "Segments" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +msgid " is not a number" +msgstr "" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13521,41 +14112,19 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" msgstr "" @@ -13571,5 +14140,5 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "" @@ -14216,38 +14785,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "" @@ -14261,5 +14800,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "" @@ -14374,10 +14913,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15075,6 +15614,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "" @@ -15520,5 +16059,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "" @@ -15636,5 +16175,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15646,5 +16185,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "" @@ -15902,4 +16441,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -15931,8 +16473,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "" @@ -16080,9 +16624,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "" @@ -16327,5 +16872,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "" @@ -16360,5 +16905,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "" @@ -16392,6 +16937,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "" @@ -16441,5 +16986,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "" @@ -16627,6 +17172,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "" @@ -16747,5 +17292,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16771,4 +17315,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16778,15 +17323,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "" @@ -16998,7 +17543,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "" @@ -17417,5 +17962,5 @@ msgstr "" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17425,5 +17970,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "" @@ -17949,32 +18494,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "" @@ -18033,91 +18578,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18132,5 +18677,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18149,7 +18694,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "" @@ -18165,5 +18710,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "" @@ -18176,6 +18721,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "" @@ -18214,22 +18759,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "" @@ -18237,5 +18770,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "" @@ -18244,10 +18777,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "" @@ -18255,5 +18788,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "" @@ -18261,10 +18794,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "" @@ -18273,22 +18806,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18298,5 +18824,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18304,5 +18830,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18310,5 +18836,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -18316,5 +18842,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -18322,5 +18848,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -18329,5 +18855,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -18335,5 +18861,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "" @@ -18342,5 +18868,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "" @@ -18352,5 +18878,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18358,10 +18884,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "" @@ -18370,10 +18896,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -18382,5 +18908,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "" @@ -18389,5 +18915,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "" @@ -18395,5 +18921,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "" @@ -18403,5 +18929,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "" @@ -18410,17 +18936,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "" @@ -18428,5 +18962,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "" @@ -18434,5 +18968,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "" @@ -18440,5 +18974,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "" @@ -18446,15 +18980,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "" @@ -18462,10 +18996,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "" @@ -18477,5 +19011,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -18484,15 +19018,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "" @@ -18500,20 +19034,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "" @@ -18521,10 +19055,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "" @@ -18532,30 +19066,30 @@ #. item "Travel/Accomodation/Hostel" #. +#: build/trans_presets.java:1596 +msgid "Edit Hostel" +msgstr "" + +#. item "Travel/Accomodation/Hostel" text "Name" +#: build/trans_presets.java:1600 +msgid "Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" +#: build/trans_presets.java:1601 +msgid "Edit Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" text "Elevation" +#: build/trans_presets.java:1606 +msgid "Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" #: build/trans_presets.java:1607 -msgid "Edit Hostel" -msgstr "" - -#. item "Travel/Accomodation/Hostel" text "Name" +msgid "Edit Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" text "Name" #: build/trans_presets.java:1611 -msgid "Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 -msgid "Edit Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 -msgid "Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 -msgid "Edit Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 msgid "Camping Site" msgstr "" @@ -18563,10 +19097,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "" @@ -18577,5 +19111,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "" @@ -18583,5 +19117,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "" @@ -18589,5 +19123,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "" @@ -18595,61 +19129,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "" @@ -18657,9 +19191,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "" @@ -18667,9 +19201,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "" @@ -18677,18 +19211,18 @@ #. item "Food+Drinks/Pub" #. +#: build/trans_presets.java:1644 +msgid "Edit Pub" +msgstr "" + +#: build/trans_presets.java:1649 +msgid "Biergarten" +msgstr "" + +#. item "Food+Drinks/Biergarten" +#: build/trans_presets.java:1650 +msgid "Edit Biergarten" +msgstr "" + #: build/trans_presets.java:1655 -msgid "Edit Pub" -msgstr "" - -#: build/trans_presets.java:1660 -msgid "Biergarten" -msgstr "" - -#. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 -msgid "Edit Biergarten" -msgstr "" - -#: build/trans_presets.java:1666 msgid "Bar" msgstr "" @@ -18696,9 +19230,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "" @@ -18706,24 +19240,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "" @@ -18731,9 +19265,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "" @@ -18742,9 +19276,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "" @@ -18752,24 +19286,24 @@ #. item "Tourism/Viewpoint" #. +#: build/trans_presets.java:1694 +msgid "Edit Viewpoint" +msgstr "" + +#. item "Tourism/Viewpoint" text "Name" +#: build/trans_presets.java:1697 +msgid "Look-Out Tower" +msgstr "" + +#. item "Tourism/Viewpoint" check "Look-Out Tower" +#: build/trans_presets.java:1699 +msgid "Theme Park" +msgstr "" + +#. item "Tourism/Theme Park" +#: build/trans_presets.java:1700 +msgid "Edit Theme Park" +msgstr "" + #: build/trans_presets.java:1705 -msgid "Edit Viewpoint" -msgstr "" - -#. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 -msgid "Look-Out Tower" -msgstr "" - -#. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 -msgid "Theme Park" -msgstr "" - -#. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 -msgid "Edit Theme Park" -msgstr "" - -#: build/trans_presets.java:1716 msgid "Artwork" msgstr "" @@ -18777,5 +19311,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "" @@ -18783,19 +19317,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18833,5 +19367,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18839,28 +19373,28 @@ msgstr "" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -18870,5 +19404,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18876,6 +19410,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "" @@ -18883,5 +19417,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -18889,6 +19423,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "" @@ -18896,5 +19430,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -18902,46 +19436,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -18949,29 +19483,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "" @@ -18979,25 +19513,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "" @@ -19006,19 +19540,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "" @@ -19027,9 +19561,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "" @@ -19037,10 +19571,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19048,5 +19582,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19054,15 +19588,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "" @@ -19070,55 +19604,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" +msgid "Leisure" +msgstr "" + +#. group "Leisure" #: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" +msgid "Water Park" +msgstr "" + +#. item "Leisure/Water Park" +#: build/trans_presets.java:1866 +msgid "Edit Water Park" +msgstr "" + +#. item "Leisure/Water Park" text "Name" #: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 -msgid "Leisure" -msgstr "" - -#. group "Leisure" -#: build/trans_presets.java:1876 -msgid "Water Park" -msgstr "" - -#. item "Leisure/Water Park" -#: build/trans_presets.java:1877 -msgid "Edit Water Park" -msgstr "" - -#. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 msgid "Playground" msgstr "" @@ -19126,35 +19660,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "" @@ -19168,6 +19702,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "" @@ -19559,30 +20093,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "" @@ -19592,225 +20126,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -19849,21 +20383,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "" @@ -19902,203 +20436,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" +#: build/trans_presets.java:1942 +msgid "Edit 10pin" +msgstr "" + +#: build/trans_presets.java:1947 +msgid "Athletics" +msgstr "" + +#. item "Sport/Athletics" +#: build/trans_presets.java:1948 +msgid "Edit Athletics" +msgstr "" + #: build/trans_presets.java:1953 -msgid "Edit 10pin" -msgstr "" - -#: build/trans_presets.java:1958 -msgid "Athletics" -msgstr "" - -#. item "Sport/Athletics" +msgid "Archery" +msgstr "" + +#. item "Sport/Archery" +#: build/trans_presets.java:1954 +msgid "Edit Archery" +msgstr "" + #: build/trans_presets.java:1959 -msgid "Edit Athletics" -msgstr "" - -#: build/trans_presets.java:1964 -msgid "Archery" -msgstr "" - -#. item "Sport/Archery" +msgid "Climbing" +msgstr "" + +#. item "Sport/Climbing" +#: build/trans_presets.java:1960 +msgid "Edit Climbing" +msgstr "" + #: build/trans_presets.java:1965 -msgid "Edit Archery" -msgstr "" - -#: build/trans_presets.java:1970 -msgid "Climbing" -msgstr "" - -#. item "Sport/Climbing" -#: build/trans_presets.java:1971 -msgid "Edit Climbing" -msgstr "" - -#: build/trans_presets.java:1976 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" +#: build/trans_presets.java:1966 +msgid "Edit Canoeing" +msgstr "" + +#. item "Sport/Cycling" +#: build/trans_presets.java:1972 +msgid "Edit Cycling" +msgstr "" + #: build/trans_presets.java:1977 -msgid "Edit Canoeing" -msgstr "" - -#. item "Sport/Cycling" +msgid "Dog Racing" +msgstr "" + +#. item "Sport/Dog Racing" +#: build/trans_presets.java:1978 +msgid "Edit Dog Racing" +msgstr "" + #: build/trans_presets.java:1983 -msgid "Edit Cycling" -msgstr "" - -#: build/trans_presets.java:1988 -msgid "Dog Racing" -msgstr "" - -#. item "Sport/Dog Racing" +msgid "Equestrian" +msgstr "" + +#. item "Sport/Equestrian" +#: build/trans_presets.java:1984 +msgid "Edit Equestrian" +msgstr "" + #: build/trans_presets.java:1989 -msgid "Edit Dog Racing" -msgstr "" - -#: build/trans_presets.java:1994 -msgid "Equestrian" -msgstr "" - -#. item "Sport/Equestrian" +msgid "Horse Racing" +msgstr "" + +#. item "Sport/Horse Racing" +#: build/trans_presets.java:1990 +msgid "Edit Horse Racing" +msgstr "" + #: build/trans_presets.java:1995 -msgid "Edit Equestrian" -msgstr "" - -#: build/trans_presets.java:2000 -msgid "Horse Racing" -msgstr "" - -#. item "Sport/Horse Racing" +msgid "Gymnastics" +msgstr "" + +#. item "Sport/Gymnastics" +#: build/trans_presets.java:1996 +msgid "Edit Gymnastics" +msgstr "" + #: build/trans_presets.java:2001 -msgid "Edit Horse Racing" -msgstr "" - -#: build/trans_presets.java:2006 -msgid "Gymnastics" -msgstr "" - -#. item "Sport/Gymnastics" +msgid "Motor Sports" +msgstr "" + +#. item "Sport/Motor Sports" +#: build/trans_presets.java:2002 +msgid "Edit Motor Sports" +msgstr "" + #: build/trans_presets.java:2007 -msgid "Edit Gymnastics" -msgstr "" - -#: build/trans_presets.java:2012 -msgid "Motor Sports" -msgstr "" - -#. item "Sport/Motor Sports" +msgid "Skating" +msgstr "" + +#. item "Sport/Skating" +#: build/trans_presets.java:2008 +msgid "Edit Skating" +msgstr "" + #: build/trans_presets.java:2013 -msgid "Edit Motor Sports" -msgstr "" - -#: build/trans_presets.java:2018 -msgid "Skating" -msgstr "" - -#. item "Sport/Skating" +msgid "Skateboard" +msgstr "" + +#. item "Sport/Skateboard" +#: build/trans_presets.java:2014 +msgid "Edit Skateboard" +msgstr "" + #: build/trans_presets.java:2019 -msgid "Edit Skating" -msgstr "" - -#: build/trans_presets.java:2024 -msgid "Skateboard" -msgstr "" - -#. item "Sport/Skateboard" -#: build/trans_presets.java:2025 -msgid "Edit Skateboard" -msgstr "" - -#: build/trans_presets.java:2030 msgid "Swimming" msgstr "" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "" @@ -20106,56 +20640,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "" @@ -20163,182 +20697,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "" #. item "Sport (Ball)/Soccer" +#: build/trans_presets.java:2044 +msgid "Edit Soccer" +msgstr "" + +#: build/trans_presets.java:2049 +msgid "Football" +msgstr "" + +#. item "Sport (Ball)/Football" +#: build/trans_presets.java:2050 +msgid "Edit Football" +msgstr "" + #: build/trans_presets.java:2055 -msgid "Edit Soccer" -msgstr "" - -#: build/trans_presets.java:2060 -msgid "Football" -msgstr "" - -#. item "Sport (Ball)/Football" +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2056 +msgid "Edit Australian Football" +msgstr "" + #: build/trans_presets.java:2061 -msgid "Edit Football" -msgstr "" - -#: build/trans_presets.java:2066 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" +msgid "Baseball" +msgstr "" + +#. item "Sport (Ball)/Baseball" +#: build/trans_presets.java:2062 +msgid "Edit Baseball" +msgstr "" + #: build/trans_presets.java:2067 -msgid "Edit Australian Football" -msgstr "" - -#: build/trans_presets.java:2072 -msgid "Baseball" -msgstr "" - -#. item "Sport (Ball)/Baseball" +msgid "Basketball" +msgstr "" + +#. item "Sport (Ball)/Basketball" +#: build/trans_presets.java:2068 +msgid "Edit Basketball" +msgstr "" + #: build/trans_presets.java:2073 -msgid "Edit Baseball" -msgstr "" - -#: build/trans_presets.java:2078 -msgid "Basketball" -msgstr "" - -#. item "Sport (Ball)/Basketball" +msgid "Golf" +msgstr "" + +#. item "Sport (Ball)/Golf" +#: build/trans_presets.java:2074 +msgid "Edit Golf" +msgstr "" + +#. item "Sport (Ball)/Golf" combo "type" +#: build/trans_presets.java:2077 +msgid "golf_course" +msgstr "" + #: build/trans_presets.java:2079 -msgid "Edit Basketball" -msgstr "" - -#: build/trans_presets.java:2084 -msgid "Golf" -msgstr "" - -#. item "Sport (Ball)/Golf" +msgid "Boule" +msgstr "" + +#. item "Sport (Ball)/Boule" +#: build/trans_presets.java:2080 +msgid "Edit Boule" +msgstr "" + #: build/trans_presets.java:2085 -msgid "Edit Golf" -msgstr "" - -#. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 -msgid "golf_course" -msgstr "" - -#: build/trans_presets.java:2090 -msgid "Boule" -msgstr "" - -#. item "Sport (Ball)/Boule" +msgid "Bowls" +msgstr "" + +#. item "Sport (Ball)/Bowls" +#: build/trans_presets.java:2086 +msgid "Edit Bowls" +msgstr "" + #: build/trans_presets.java:2091 -msgid "Edit Boule" -msgstr "" - -#: build/trans_presets.java:2096 -msgid "Bowls" -msgstr "" - -#. item "Sport (Ball)/Bowls" +msgid "Cricket" +msgstr "" + +#. item "Sport (Ball)/Cricket" +#: build/trans_presets.java:2092 +msgid "Edit Cricket" +msgstr "" + #: build/trans_presets.java:2097 -msgid "Edit Bowls" -msgstr "" - -#: build/trans_presets.java:2102 -msgid "Cricket" -msgstr "" - -#. item "Sport (Ball)/Cricket" +msgid "Cricket Nets" +msgstr "" + +#. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + #: build/trans_presets.java:2103 -msgid "Edit Cricket" -msgstr "" - -#: build/trans_presets.java:2108 -msgid "Cricket Nets" -msgstr "" - -#. item "Sport (Ball)/Cricket Nets" +msgid "Croquet" +msgstr "" + +#. item "Sport (Ball)/Croquet" +#: build/trans_presets.java:2104 +msgid "Edit Croquet" +msgstr "" + #: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 -msgid "Croquet" -msgstr "" - -#. item "Sport (Ball)/Croquet" +msgid "Hockey" +msgstr "" + +#. item "Sport (Ball)/Hockey" +#: build/trans_presets.java:2110 +msgid "Edit Hockey" +msgstr "" + #: build/trans_presets.java:2115 -msgid "Edit Croquet" -msgstr "" - -#: build/trans_presets.java:2120 -msgid "Hockey" -msgstr "" - -#. item "Sport (Ball)/Hockey" +msgid "Pelota" +msgstr "" + +#. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + #: build/trans_presets.java:2121 -msgid "Edit Hockey" -msgstr "" - -#: build/trans_presets.java:2126 -msgid "Pelota" -msgstr "" - -#. item "Sport (Ball)/Pelota" +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" +msgid "Rugby" +msgstr "" + +#. item "Sport (Ball)/Rugby" +#: build/trans_presets.java:2128 +msgid "Edit Rugby" +msgstr "" + #: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" +msgid "Table Tennis" +msgstr "" + +#. item "Sport (Ball)/Table Tennis" +#: build/trans_presets.java:2134 +msgid "Edit Table Tennis" +msgstr "" + #: build/trans_presets.java:2139 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2144 -msgid "Table Tennis" -msgstr "" - -#. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 -msgid "Edit Table Tennis" -msgstr "" - -#: build/trans_presets.java:2150 msgid "Tennis" msgstr "" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "" @@ -20346,5 +20880,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "" @@ -20352,10 +20886,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "" @@ -20363,10 +20897,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "" @@ -20374,10 +20908,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "" @@ -20386,10 +20920,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "" @@ -20398,10 +20932,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "" @@ -20411,10 +20945,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "" @@ -20423,10 +20957,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "" @@ -20434,5 +20968,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "" @@ -20440,15 +20974,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "" @@ -20456,10 +20990,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "" @@ -20467,10 +21001,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "" @@ -20478,5 +21012,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "" @@ -20484,5 +21018,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "" @@ -20491,10 +21025,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "" @@ -20503,9 +21037,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "" @@ -20513,10 +21047,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "" @@ -20525,10 +21059,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "" @@ -20538,5 +21072,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "" @@ -20545,6 +21079,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "" @@ -20553,66 +21087,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "" @@ -20621,81 +21155,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "" @@ -20704,5 +21238,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "" @@ -20710,5 +21244,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "" @@ -20716,20 +21250,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "" @@ -20738,5 +21277,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "" @@ -20744,61 +21283,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "" #. group "Man Made" +#: build/trans_presets.java:2294 +msgid "Works" +msgstr "" + +#. item "Man Made/Works" +#: build/trans_presets.java:2295 +msgid "Edit Works" +msgstr "" + +#. item "Man Made/Works" text "Name" +#: build/trans_presets.java:2299 +msgid "Tower" +msgstr "" + +#. item "Man Made/Tower" +#: build/trans_presets.java:2300 +msgid "Edit Tower" +msgstr "" + +#. item "Man Made/Tower" text "Name" +#: build/trans_presets.java:2303 +msgid "Tower type" +msgstr "" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2303 +msgid "communication" +msgstr "" + +#: build/trans_presets.java:2303 +msgid "observation" +msgstr "" + +#. #: build/trans_presets.java:2305 -msgid "Works" -msgstr "" - -#. item "Man Made/Works" -#: build/trans_presets.java:2306 -msgid "Edit Works" -msgstr "" - -#. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 -msgid "Tower" -msgstr "" - -#. item "Man Made/Tower" -#: build/trans_presets.java:2311 -msgid "Edit Tower" -msgstr "" - -#. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 -msgid "Tower type" -msgstr "" - -#. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 -msgid "communication" -msgstr "" - -#: build/trans_presets.java:2314 -msgid "observation" -msgstr "" - -#. -#: build/trans_presets.java:2316 msgid "Height (meters)" msgstr "" @@ -20806,25 +21345,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "" @@ -20832,10 +21371,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "" @@ -20843,10 +21382,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "" @@ -20855,37 +21394,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "" @@ -20895,10 +21434,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "" @@ -20906,10 +21445,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "" @@ -20917,10 +21456,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "" @@ -20928,10 +21467,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "" @@ -20939,5 +21478,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "" @@ -20945,5 +21484,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "" @@ -20953,35 +21492,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "" @@ -20990,10 +21529,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "" @@ -21002,5 +21541,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "" @@ -21008,10 +21547,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "" @@ -21022,23 +21561,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "" @@ -21047,75 +21586,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "" @@ -21124,5 +21663,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "" @@ -21130,5 +21669,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "" @@ -21136,5 +21675,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "" @@ -21142,5 +21681,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21148,5 +21687,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "" @@ -21154,15 +21693,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "" @@ -21171,5 +21710,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "" @@ -21177,36 +21716,31 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" -msgstr "" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" msgstr "" @@ -21214,31 +21748,31 @@ #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21309,39 +21843,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "" @@ -21350,30 +21884,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "" @@ -21382,10 +21916,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "" @@ -21394,10 +21928,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21405,33 +21939,56 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" +#: build/trans_presets.java:2498 +msgid "Shops" +msgstr "" + +#. group "Shops" +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +msgid "Bike Dealer" +msgstr "" + +#. item "Shops/Bike Dealer" +#. #: build/trans_presets.java:2509 -msgid "Shops" -msgstr "" - -#. group "Shops" -#: build/trans_presets.java:2510 +msgid "Edit Bicycle Shop" +msgstr "" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "" @@ -21439,9 +21996,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "" @@ -21449,27 +22006,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "" @@ -21477,5 +22034,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "" @@ -21483,88 +22040,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "" @@ -21572,9 +22129,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "" @@ -21582,9 +22139,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "" @@ -21592,18 +22149,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21611,54 +22168,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "" @@ -21666,9 +22223,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21676,9 +22233,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "" @@ -21686,54 +22243,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "" @@ -21741,9 +22298,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "" @@ -21751,9 +22308,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "" @@ -21761,28 +22318,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "" @@ -21790,14 +22347,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "" @@ -21805,5 +22362,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "" @@ -21811,15 +22368,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "" @@ -21827,18 +22384,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "" @@ -21846,5 +22403,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "" @@ -21852,9 +22409,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "" @@ -21862,10 +22419,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -21874,5 +22431,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -21881,20 +22438,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -21902,5 +22459,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "" @@ -21909,64 +22466,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "" @@ -21974,15 +22531,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "" @@ -21990,10 +22547,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "" @@ -22001,25 +22558,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "" @@ -22027,5 +22584,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "" @@ -22033,10 +22590,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "" @@ -22044,10 +22601,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22055,5 +22612,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22061,5 +22618,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "" @@ -22067,10 +22624,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "" @@ -22078,10 +22635,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "" @@ -22089,10 +22646,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "" @@ -22100,70 +22657,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "" @@ -22172,15 +22729,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "" @@ -22189,5 +22746,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "" @@ -22195,17 +22752,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "" @@ -22214,14 +22771,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "" @@ -22229,25 +22786,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22255,10 +22812,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "" @@ -22266,5 +22823,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "" @@ -22272,5 +22829,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "" @@ -22279,45 +22836,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "" @@ -22325,25 +22882,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22351,10 +22908,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22362,20 +22919,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "" @@ -22383,5 +22940,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -22389,15 +22946,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "" @@ -22405,9 +22962,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "" @@ -22415,39 +22972,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "" @@ -22455,15 +23012,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "" @@ -22471,55 +23028,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "" @@ -22529,5 +23086,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "" @@ -22536,10 +23093,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "" @@ -22547,5 +23104,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22554,5 +23111,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22560,34 +23117,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "" @@ -22596,15 +23153,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "" @@ -22612,5 +23169,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22619,5 +23176,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22625,5 +23182,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22695,24 +23252,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22765,5 +23322,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22772,13 +23329,13 @@ msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -22792,10 +23349,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -22803,31 +23360,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -22836,30 +23393,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23070,130 +23627,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23210,98 +23641,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "" @@ -23678,7 +24018,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23742,13 +24082,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23764,5 +24183,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23776,5 +24195,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23795,5 +24214,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "" @@ -23808,5 +24227,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23821,5 +24240,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "" @@ -23833,5 +24252,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "" @@ -23845,5 +24264,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "" @@ -23865,16 +24284,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "" - -#. color aqueduct -#. #. 1 #. 50000 @@ -23971,4 +24378,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24037,13 +24451,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24089,6 +24503,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24105,7 +24519,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24128,10 +24542,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24167,11 +24581,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24212,6 +24627,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24225,5 +24640,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "" @@ -24245,5 +24660,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24257,5 +24672,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24263,4 +24678,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24310,7 +24732,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "" @@ -24327,5 +24749,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24340,5 +24762,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24353,5 +24775,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24366,5 +24788,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24379,5 +24801,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24392,5 +24814,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24510,11 +24932,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "" @@ -24528,5 +24950,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "" @@ -24540,5 +24962,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "" @@ -24666,12 +25088,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "" @@ -24685,5 +25124,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "" @@ -24721,4 +25160,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24737,4 +25192,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24755,8 +25218,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -24858,10 +25323,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25115,5 +25580,5 @@ #. #. -#. +#. #. color health #. @@ -25259,4 +25724,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25276,23 +25749,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25324,6 +25797,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25384,14 +25857,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25738,5 +26211,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25759,5 +26231,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "" @@ -25829,8 +26302,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "" @@ -25931,9 +26404,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "" @@ -26021,9 +26494,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "" @@ -26037,5 +26510,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "" @@ -26049,5 +26522,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26069,5 +26542,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "" @@ -26081,5 +26554,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "" @@ -26093,5 +26566,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26114,5 +26587,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "" @@ -26126,5 +26599,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "" @@ -26138,5 +26611,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26150,5 +26623,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26162,5 +26635,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26217,7 +26690,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "" @@ -26231,5 +26704,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "" @@ -26242,5 +26715,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "" @@ -26255,5 +26728,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "" @@ -26267,5 +26740,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "" @@ -26320,8 +26793,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26335,5 +26808,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "" @@ -26347,5 +26820,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "" @@ -26359,5 +26832,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26371,5 +26844,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "" @@ -26383,5 +26856,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "" @@ -26459,8 +26932,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "" @@ -26508,7 +26981,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "" @@ -26658,11 +27131,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "" @@ -26710,6 +27183,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "" @@ -27065,51 +27538,9 @@ msgstr "" -#~ msgid "Images for {0}" -#~ msgstr "Imagini pentru {0}" - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Nu există timp pentru punctul {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Nu am găsit imagini cu mărci de timp citibile." - -#~ msgid "GPS start: {0}" -#~ msgstr "Start GPS: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "Sfârşit GPS: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "diferentă curentă: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "diferenţă zonă de timp: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} în urmă." - -#~ msgid "Sync clock" -#~ msgstr "Sincronizare ceas" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Nu există timp EXIF în fişierul \"{0}\"." - -#~ msgid "Image" -#~ msgstr "Imagine" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Sincronizare timp cu unitatea GPS" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Timpul introdus nu a putut fi interpretat." +#~ msgid "Incorrect password or username." +#~ msgstr "Parolă sau nume utilizator incorecte." + +#~ msgid "Enter Password" +#~ msgstr "Introduceţi parola" #~ msgid "Unknown version" @@ -27144,4 +27575,46 @@ #~ msgstr "Au existat conflicte în timpul importului." +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Nu există timp pentru punctul {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Nu am găsit imagini cu mărci de timp citibile." + +#~ msgid "GPS start: {0}" +#~ msgstr "Start GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Sfârşit GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "diferentă curentă: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "diferenţă zonă de timp: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} în urmă." + +#~ msgid "Sync clock" +#~ msgstr "Sincronizare ceas" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Nu există timp EXIF în fişierul \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Imagine" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Timpul introdus nu a putut fi interpretat." + #~ msgid "Error while parsing" #~ msgstr "Eroare la prelucrare" @@ -27185,7 +27658,4 @@ #~ msgstr "Selectaţi întâi un semn de carte." -#~ msgid "File could not be found." -#~ msgstr "Fişierul nu a putut fi găsit." - #~ msgid "No document open so nothing to save." #~ msgstr "Nu este nici un document deschis, nu este nimic de salvat." @@ -27193,4 +27663,7 @@ #~ msgid "Unknown file extension." #~ msgstr "Extensie fişier necunoscută." + +#~ msgid "Images for {0}" +#~ msgstr "Imagini pentru {0}" #~ msgid "{0} object has conflicts:" @@ -27203,6 +27676,6 @@ #~ msgstr "Se pot edita doar paginile din ajutorul JOSM online" -#~ msgid "Upload to OSM..." -#~ msgstr "Despre JOSM..." +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Sincronizare timp cu unitatea GPS" #~ msgid "Some of the nodes are (almost) in the line" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 19198) +++ /applications/editors/josm/i18n/po/ru.po (revision 19199) @@ -4,10 +4,11 @@ # FIRST AUTHOR , 2007. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-12-04 15:16+0000\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-17 08:20+0000\n" "Last-Translator: Calibrator \n" "Language-Team: Koptev Oleg \n" @@ -17,40 +18,40 @@ "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: 2009-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:30+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-Language: Russian\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Создание интерфейса" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Справка" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнорируется неверная ссылка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -62,21 +63,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -97,17 +98,8 @@ msgstr "Предупреждение" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнорирование неправильной ссылки на файл: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Не удалось прочитать файл ''{0}''.
Ошибка:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -115,8 +107,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Не удалось прочитать файл ''{0}''.
Ошибка:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -124,10 +125,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -139,9 +140,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -150,6 +152,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -204,8 +206,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -273,5 +275,5 @@ msgstr "О программе" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -283,5 +285,5 @@ "базы API: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -292,5 +294,5 @@ "персональную страницу OSM-пользователя невозможно. Адрес базы API: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -301,15 +303,20 @@ "окнами
и приводит к замедлению работы." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Продолжить" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -318,29 +325,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -357,5 +365,10 @@ msgstr "Отмена" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Не удалось запустить внешний браузер справки" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -373,5 +386,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Объединить" @@ -391,15 +404,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Добавить точку..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Добавить точку, указав её широту и долготу" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -415,22 +428,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Править: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Введите координаты новой точки" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Использовать десятичные градусы" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Отрицательные значения обозначают западное/южное полушарие" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -439,5 +452,5 @@ msgstr "Широта" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -446,28 +459,29 @@ msgstr "Долгота" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "Пожалуйста , введите правильную широту в диапазоне -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "Введите широту в диапазоне -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "Пожалуйста, введите правильную долготу в диапазоне -180..180" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "Введите долготу в диапазоне -180..180" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -479,9 +493,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "Закрыть диалог и создать новую точку" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "Закрыть диалог, не создавая новую точку" @@ -502,18 +516,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -525,5 +539,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -545,6 +559,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -592,5 +606,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "конфликта" @@ -627,14 +641,15 @@ msgstr "Нет конфликтов чтобы их приблизить" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Закрыть открытые пакеты правок" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Закрывает открытые пакеты правок" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -644,21 +659,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Файл: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Пакеты правок не открыты" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Нет открытых пакетов правок" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Скачиваение открытых пакетов правок ..." @@ -744,11 +759,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -826,16 +842,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -871,5 +892,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Дублировать" @@ -912,10 +933,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Экспорт в GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Экспортировать данные в GPX файл" @@ -930,12 +951,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -960,8 +981,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -972,10 +993,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -988,17 +1009,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1035,22 +1056,29 @@ msgstr "Показать информацию об объектах OSM: линиях, точках или отношениях." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Объединить накладывающиеся полигоны" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Объединить полигоны, накладывающиеся друг на друга" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "" +"Пожалуйста, выберите по крайней мере, одну замкнутую линию, которые должны " +"быть объединены." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Только два полигона могут быть объединены в данный момент." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" не замкнут, и поэтому они не могут быть объединены." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1063,41 +1091,35 @@ "удалены. Вы действительно хотите продолжить?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Пожалуйста, остановитесь, если вы не уверены" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" -"Пожалуйста, выберите по крайней мере, одну замкнутую линию, которые должны " -"быть объединены." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "Пересечений не найдено. Изменений сделано не было." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Добавлены точки на всех пересечениях" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" "Удалить линии, которые не являются внутренней частью области с вложениями" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Исправить отношения" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Объединённый самоперекрывающийся полигон" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Объединённые наложенные полигоны" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1107,33 +1129,33 @@ "Пожалуйста, проверьте не появились ли ошибки." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Введите значения для всех конфликтов." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Решение конфликтов" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Исправить конфликт тегов" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Удалённый из отношений элемент" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Объединить полигоны: короткие линии удаляются" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Замкнутая линия" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Удалить теги у внутренних линий" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Функция объединения полигонов" @@ -1301,5 +1323,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Невозможно переместить объекты за пределы мира." @@ -1379,11 +1401,11 @@ msgstr "Скачать данные" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Сделать углы прямыми" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" @@ -1391,18 +1413,18 @@ "градусов" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 msgid "Orthogonalize Shape / Undo" msgstr "Ортогонализировать форму / Отменить" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 msgid "Undo orthogonalization for certain nodes" msgstr "Отменить ортогонализирование для определённых точек" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "Ортогонализировать / Отменить" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1414,9 +1436,9 @@ "Ортогонализирования формы!" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "Отменить ортогонализирование формы" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1429,16 +1451,16 @@ "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Сделать углы прямыми" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Использование" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "Выделенные элементы невозможно ортогонализировать" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Сделать углы прямыми" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1513,18 +1535,18 @@ msgstr "Не возможно переименовать файл ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Изменить направление линии" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Изменить направление всех выделенных линий." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Пожалуйста, выберите как минимум одну линию." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Изменить направление линий" @@ -1533,10 +1555,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Сохранить" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Сохранить текущие данные." @@ -1593,10 +1615,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Сохранить как..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Сохранить текущие данные в новый файл." @@ -1641,6 +1663,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1673,5 +1694,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1742,5 +1763,5 @@ "линии)." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1751,5 +1772,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1759,5 +1780,5 @@ "необходимо проверить и исправить, если потребуется." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1791,40 +1812,40 @@ msgstr "Данная точка ни к чему не прикреплена." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Ни одна из этих точек ни к чему не прикреплена." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "" "Ни одна из этих точек, находящихся на линиях, ни к чему не прикреплена." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Выделенные объекты невозможно разъединить" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Выберите один из вариантов:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Одна точка с тегами, либо" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Одна точка, используемая несколькими линиями, либо" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* Одна точка, используемая несколькими линиями и одной из этих линий, либо" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* Одна точка, используемая несколькими линиями и одной из этих линий, либо" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* Одна линия, имеющая точки, используемые несколькими линиями, либо" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1833,5 +1854,5 @@ "несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1844,9 +1865,9 @@ "и все точки будут выделены." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Неприкрепленная точка" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1854,5 +1875,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1887,10 +1908,10 @@ msgstr "Снять выделение со всего (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Обновить данные" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "Обновляет объекты в активном слое данных, скачивая их с сервера." @@ -1898,23 +1919,23 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "Скачать данные" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Не найден текущий набор данных" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "Объект с id {0} не найден в текущем наборе данных" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "Обновить выбор" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1923,30 +1944,26 @@ "заново)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Обновить выборку" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "Нет выбранных объектов для обновления." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Выборка пуста" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "Обновить объекты" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Загрузить данные на сервер" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "Передать все изменения в активном слое на сервер OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1957,5 +1974,5 @@ "устранить." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1963,161 +1980,7 @@ msgstr "Нет изменений для загрузки на сервер." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Нечего загружать. Сначала создайте данные." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "Синхронизировать только точку {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "Синхронизировать только линию {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Синхронизировать только отношение {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Синхронизировать весь набор данных" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"Загрузка на сервер прервана так как на сервере есть " -"более новая версия одной
из ваших точек, линий или отношений.
Причиной " -"конфликта является {0} с id {1},
версия " -"данных на сервере {2}, ваша версия {3}.

Нажмите {4}, " -"чтобы синхронизировать только конфликтный элемент.
Нажмите {5}, чтобы синхронизировать весь локальный набор данных с сервером." -"
Нажмите {6}, чтобы прервать, затем продолжите " -"редактирование.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Обнаружены конфликты" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Загрузка на сервер не удалась, так как на сервере " -"имеется более новая версия одной
из ваших точек, линий или отношений. " -"

. Нажмите на {0} для синхронизации локальных данных " -"с сервером.
Нажмите {1} чтобы прервать, затем " -"продолжите редактирование.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"Загрузка на сервер не удалась потому что вы " -"используете
пакет правок {0}, который уже был закрыт в {1}." -"
Пожалуйста, загрузите снова, используя новый или существующий открытый " -"пакет правок." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Пакет правок закрыт" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "Подготовить устранение конфликта" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "Щёлкните, чтобы скачать с сервера все родительские линии для точки {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "Щёлкните, чтобы отменить и подтвердить правку карты" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" -"Загрузка на сервер не удалась, потому что вы пытались " -"удалить точку {0}, которая ещё используется в линии {1}.

Щёлкните " -"{2}, чтобы скачать с сервера все родительские линии точки " -"{0}.
Если потребуется, JOSM создаст конфликты, которые вы сможете " -"устранить в диалоге устранения конфликтов." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "Точка ещё используется" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" -"Предупреждение: ошибка в заголовке \"{0}\" не соответствует ожидаемому " -"образцу" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Обновление элемента" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Загрузка данных на сервер по слою ''{0}''" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Предупреждение: объект ''{0}'' уже удалён на сервере. Данные будут переданы " -"снова на сервер, но без этого объекта." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" -"Объект ''{0}'' уже удалён. Объект будет пропущен при передаче данных на " -"сервер." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "Передача объектов на сервер. Кол-во: {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" -"Игнорирование выявленного исключения, так как загрузка на сервер отменена. " -"Исключение: {0}" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2252,9 +2115,9 @@ msgstr "Скачанные GPX данные" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Скачивание данных" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2264,5 +2127,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "В этом месте нет данных." @@ -2342,7 +2205,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2360,58 +2223,52 @@ "объекты." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Рисовать" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Рисовать точки" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Режим: Рисование фокуса" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "выделено" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Точка не может быть добавлена за пределами мира." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Добавить точку" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Вставить точку в линию" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Присоединить линию к точке" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Добавить новую точку к линии" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Добавить точку к линии и объединить" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Создать новую точку" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Выделить точку под курсором." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2421,14 +2278,14 @@ msgstr[2] "Вставить новую точку в {0} линий" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Начать новую линию с последней точки" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Продолжить линию с последней точки" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Закончено вычерчивание" @@ -2474,18 +2331,19 @@ "этой точке" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Выбор" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Выбирать, двигать и вращать объекты" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2495,17 +2353,17 @@ msgstr[2] "Добавьте или переместите новую виртуальную точку на {0} линий" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Переместить элементы" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Переместить" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Отмена перемещения" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2518,13 +2376,13 @@ "часто производится по ошибке. Действительно переместить их?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Всегда перемещать и больше не показывать этого предупреждения" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2533,9 +2391,9 @@ "объединения с ближайшей точкой." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Отпустите кнопку мыши, чтобы прекратить вращение." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2548,5 +2406,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Масштаб" @@ -2570,5 +2428,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Поиск объектов." @@ -2660,7 +2518,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - все объекты, измененные заданным пользователем" +msgstr "" +"user:anonymous - все объекты, изменённые анонимным пользователем" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2669,8 +2527,20 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "точки:... - объект с заданным количеством точек" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" +"tags:... - объект с заданным количеством тегов (tags:кол-во или tags:" +"мин-макс)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2680,21 +2550,27 @@ "мин-макс)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - все измененные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - все выделенные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - все незаконченные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - все объекты без тегов" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2703,5 +2579,5 @@ "выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2710,5 +2586,5 @@ "выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2716,5 +2592,5 @@ "«или»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2722,11 +2598,11 @@ "ключ содержит двоеточие)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Используйте ( and ) для группировки выражений" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2734,55 +2610,55 @@ msgstr "Фильтр" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "Принять фильтр" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Начать поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Не найдено совпадений для ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ничего не удалено из выделения в результате поиска ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Ничего не найдено в выделенном, при поиске ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Найдено {0} совпадений" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2795,5 +2671,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2801,10 +2677,10 @@ "использования: ключ=значение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2813,26 +2689,29 @@ "отношение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Неожиданный знак: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Отсутствуют параметры для \"ИЛИ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Отсутствуют параметры для \"НЕ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Отсутствует закрывающая скобка" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Отсутствуют параметры для \"ИЛИ\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "Неверное количество параметров оператора tags." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2843,9 +2722,9 @@ "выходящее за пределы допустимого диапазона, например: tags:1 или tags:2-5" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Неверное число параметров для оператора точек." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2856,7 +2735,12 @@ "или диапазон, например, точки:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Неверное значение id оператора: {0}. Ожидалось число." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Неверное значение id оператора: {0}. Ожидалось число." @@ -2890,45 +2774,35 @@ msgstr "Ошибка связи с сервером." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Текущее число изменений превысило максимальное, текущее - {0}, максимальное " -"- {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" +"Предупреждение: автоматическое усечение значение тега ''{0}'' на удалёном " +"объекте {1}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" +"Длина значения тега ''{0}'' на объекте {1} превышает макс. разрешённую длину " +"{2}. Длина значения {3}." + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Нарушение предусловия" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" +"точек в линии {1}: {0} шт. Это превышает максимально допустимое кол-во точек " +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Нарушение возможностей API" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Предупреждение: автоматическое усечение значения тега ''{0}'' на удалённом " -"элементе {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"Длина значения для тега \"{0}'' элемента {1} превышает максимально " -"допустимую длину {2}. Значение длины {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Нарушение предусловия" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"точек в линии {1}: {0} шт. Это превышает максимально допустимое кол-во точек " -"{2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -3044,5 +2918,5 @@ msgstr "Установить {0}={1} для {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -3059,5 +2933,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Двойной конфликт" @@ -3165,4 +3039,19 @@ msgstr "Устранить конфликт при удалении {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3278,5 +3167,5 @@ msgstr "Применить?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3360,15 +3249,15 @@ msgstr "Ожидался параметр ''{0}'' > 0.0, получено {1}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "Ошибка: не удается сохранить свойства для ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "Ошибка в файле конфигурации на строках {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3379,5 +3268,5 @@ "не является каталогом." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3388,5 +3277,5 @@ "является каталогом." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3397,5 +3286,5 @@ "отсутствующий каталог параметров: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3406,5 +3295,5 @@ "каталог параметров: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3414,5 +3303,5 @@ "параметрами по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3423,5 +3312,5 @@ "параметров по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3432,5 +3321,5 @@ "параметров к состоянию по умолчанию: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3441,5 +3330,5 @@ "резервный
{0}
а новый будет создан с параметрами по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3450,10 +3339,10 @@ "параметров {0} к состоянию по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3463,24 +3352,24 @@ "''{2}''" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Параметры сохранены на {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Невозможно загрузить параметры. Причина: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Невозможно скачать параметры с сервера." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "Ошибка: Неожиданная строка ''{0}'' в списке закладок с сервера" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3491,5 +3380,5 @@ "с сервера" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3522,5 +3411,5 @@ msgstr "Предупреждение: отсутствует файл исправлений ''/REVISION''." -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3542,31 +3431,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "Ю" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "С" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "З" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "В" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Пакет правок {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3575,5 +3457,5 @@ "Невозможно добавить примитив {0} к набору данных, так как он уже присутствует" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3587,26 +3469,26 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Отстутствует результат слияния для линии с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Отстутствует результат слияния для точки с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Отстутствует результат слияния для объекта с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Отстутствует результат слияния для отношения с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3615,5 +3497,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3628,5 +3510,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3634,25 +3516,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "С" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "Текст" #. column header: apply filter for children -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "C" msgstr "М" #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "I" msgstr "И" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "Р" @@ -3660,43 +3542,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "З" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "Д" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "У" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "В" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "обнаружен id >= 0. Получено {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "Элемент с id=0 не может быть невидимым" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "обнаружено id > 0. Получено {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "обнаружена версия > 0. Получено {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Ожидался параметр ''{0}'' > 0, получено {1}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3706,5 +3600,5 @@ "другой нет" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3735,11 +3629,6 @@ "несколькими значениями." -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" -"Найден пользователь с тем же идентификатором пользователя, но с другим именем" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3747,7 +3636,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3762,5 +3651,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3778,72 +3667,72 @@ msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Линия, обозначающая границу области, не замкнута." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "область с вложениями ''{0}'' не замкнута" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "В отношении «{0}» имеется участник, который был удален." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Линия «{0}» имеет меньше двух точек." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Обнаружена больше чем одна линия \"от\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Обнаружено больше одной линии \"до\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Найдено больше одного \"via\" (через)." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Неизвестная роль «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Неизвестный тип участника для «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Не найдена линия \"от\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Не найдена линия \"до\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Не найдена точка или линия \"via\" (через)." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" "Линия \"from\" (от) не начинается или заканчивается на точке \"via\" (через)." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" "Линия \"to\" (до) не начинается и не заканчивается на точке \"via\" (через)." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" @@ -3851,40 +3740,40 @@ "\" (через)." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" "Линия \"to\" (до) не начинается и не заканчивается на линии \"via\" (через)." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Стиль для ограничения {0} не найден." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Персечение между линиями ''{0}'' и ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Внутренняя линия «{0}» находится снаружи." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Нет полезной роли ''{0}'' для пути ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "не-линия ''{0}'' области с вложениями" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Для области с вложениями «{0}» отсутствует внешняя линия." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." @@ -3892,38 +3781,30 @@ "Стиль для внутренней линии ''{0}'' такой же, как у области с вложениями." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Стиль для внешней линии ''{0}'' отсутствует." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "без тегов" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "текст" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "для_текста" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Ошибка: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Предупреждение: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "неактивный" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "выделено" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3933,6 +3814,6 @@ msgstr[2] "точек" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3942,7 +3823,8 @@ msgstr[2] "линий" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3952,21 +3834,37 @@ msgstr[2] "отношений" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "линия без тегов" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "незаконченная линия" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "фон" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "подсветка" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "без тегов" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "текст" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "для_текста" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -4111,5 +4009,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "железная дорога" @@ -4125,7 +4023,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4143,4 +4041,10 @@ msgstr[2] "{0} участников" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Пакет правок {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4172,6 +4076,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Конфликт" @@ -4185,7 +4089,7 @@ msgstr "Объект удалён" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4270,74 +4174,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Имя пользователя" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Пароль" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "использование" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "опции" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Показать эту справку" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Стандартный параметр геометрии unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Скачать область в пределах рамки" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Открыть файл (как данные GPS, если .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Скачать область в пределах рамки, как данные GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Выбор с учетом поиска" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Запуск в развернутом виде" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Восстановить параметры по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Установить язык." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "системные настройки Java" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "Сменить папку для всех настроек пользователя" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4349,9 +4253,9 @@ " настройки Java для увеличения максимально размера используемой памяти" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "примеры" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4361,25 +4265,25 @@ "убедитесь, что загружаете данные перед --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Вместо --download= можно указать osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Включение обновлённых модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Загрузка ранних модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Настройки по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Загрузка модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -4388,11 +4292,11 @@ "используется." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4407,22 +4311,22 @@ msgstr "Правка" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Вид" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Инструменты" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Шаблоны" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4430,5 +4334,5 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Аудио" @@ -4509,13 +4413,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "Пользователь:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "слоя нет в списке." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4548,5 +4453,5 @@ msgstr "Инициализация" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4556,6 +4461,6 @@ "1 отношения." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4566,5 +4471,5 @@ "{0} отношений." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4575,5 +4480,5 @@ "{1} отношений." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4583,25 +4488,25 @@ msgstr[2] "Удаление {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "Удалить объекты" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "Удалить" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "Из отношения" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "Поз." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4609,9 +4514,9 @@ msgstr "Роль" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "Щёлкните, чтобы закрыть диалог и удалить объект из отношений" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "Щёлкните, чтобы закрыть диалог и отменить удаление объектов" @@ -4643,11 +4548,11 @@ msgstr "роль {0} не участвует в паре сравнения {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Параметры" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4656,6 +4561,6 @@ msgstr "Теги" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4663,6 +4568,6 @@ msgstr "Точки" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4670,23 +4575,23 @@ msgstr "Участники" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Нет конфликтов тегов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Теги ({0} конфликтов)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} неустранённых конфликтов тегов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Точки (без конфликтов)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4695,17 +4600,17 @@ "точек этой линии" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Точки (с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Неустранённые конфликты в списке точек этой линии" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Члены (без конфликтов)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4715,21 +4620,21 @@ "конфликтов в списке участников этого отношения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Участники отношений(с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "Неразрешённые конфликты в списке участников этого отношения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Нет актуальных конфликтов свойств" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Свойства (с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Конфликты свойств, ожидающие устранения" @@ -4762,22 +4667,22 @@ msgstr "пункт {0} не найден в списке" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "блокировать прокрутку" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Сравнить " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Моя версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Список элементов в моём наборе данных, то есть локальном наборе данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4785,5 +4690,5 @@ msgstr "Объединённая версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4793,30 +4698,30 @@ "объединении будет принято." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Их версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Список элементов в их наборе данных, набор данных на сервере" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> наверх" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Скопировать выделенные точки в начало списка объединённых точек" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> вниз" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "Скопировать выделенные элементы в конец списка объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4826,5 +4731,5 @@ "объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4834,5 +4739,5 @@ "списке объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4840,10 +4745,10 @@ "Скопировать их выделенные элементы в начало списка объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" "Скопировать их выделенные элементы в конец списка объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4853,5 +4758,5 @@ "списке объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4861,23 +4766,23 @@ "списке объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Вверх" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Поднять выделенные элементы на одну позицию" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Вниз" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Опустить выделенные элементы на одну позицию" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4888,27 +4793,27 @@ msgstr "Удалить" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "Удалить выделенные записи из списка объединённых элементов" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Заблокировать" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Заблокировать" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Заблокировать текущий список объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Разблокировать" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Разблокировать список объединённых элементов и начать объединение" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4919,5 +4824,5 @@ "записей" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4928,5 +4833,5 @@ "записей" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4936,5 +4841,5 @@ msgstr[2] "Моя версия ({0} записей)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4944,5 +4849,5 @@ msgstr[2] "Объединённая версия ({0} записей)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4952,5 +4857,5 @@ msgstr[2] "Их версия ({0} записей)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4962,5 +4867,5 @@ "синхронизированных регулировках." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5214,10 +5119,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5227,10 +5132,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5317,9 +5222,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Применить" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5327,6 +5232,6 @@ msgstr "ничего" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "все" @@ -5417,7 +5322,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5428,6 +5333,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5553,4 +5458,61 @@ msgstr "Показать только теги с конфликтами" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Удалить выделенные объекты." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +#, fuzzy +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" +"Пометьте, чтобы скачать данные в новый слой данных.
Снимите " +"пометку, чтобы скачать данные с сервера в текущий активный слой." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Пакет правок" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "Приблизиться к этой точке в текущем слое" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +#, fuzzy +msgid "Select all objects assigned to the currently selected changesets" +msgstr "Закрыть открытый пакет правок, выбранный в настоящий момент" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Скачать" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Скачать картографические данные с сервера OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Закрыть выбранные открытые пакеты правок" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Показать информацию" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Открыть редактор для выбранного отношения" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5564,12 +5526,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5587,13 +5549,13 @@ msgstr "Стек команд: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "Устранить конфликты." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Устранить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5601,6 +5563,6 @@ "объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5608,25 +5570,25 @@ msgstr "Выделить на карте объекты, выбранные в списке вверху." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Отменить устранение конфликтов и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Применить устранение конфликтов и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Применить устранение конфликтов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "Закрыть в любом случае" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "Продолжить решение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5644,26 +5606,26 @@ "улаживанию конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "Конфликт устранён не полностью" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Устранить конфликты" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Устранить конфликты для ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "Отфильтровать объекты и скрыть/отключить их." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5674,41 +5636,41 @@ msgstr "Добавить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "Добавить фильтр." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "Редактировать фильтр." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "Удалить фильтр." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "Переместить фильтр вверх." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "Переместить фильтр вниз." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "Включить фильтр" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "Скрыть элементы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "Применить также для дочерних элементов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "Инвертировать фильтр" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "Режим фильтра" @@ -5747,5 +5709,5 @@ msgstr "Показать историю выделенных объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "Диалог ещё не создан. Сначала используйте createInstance()" @@ -5760,34 +5722,34 @@ msgstr "Показать список всех загруженных слоёв." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Удалить выделенный слой." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Показать/скрыть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Показать/скрыть выделенный слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Включить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Активировать выделенный слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Объединить этот слой с другим слоем" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Переместить выделенный слой вверх." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Переместить выделенный слой вниз." @@ -5797,30 +5759,207 @@ msgstr "Информация о слое" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Показать список всех отношений." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Отношения: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Открыть редактор для выбранного отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Удалить выбранное отношение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Создать новое отношение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "Создать копию этого отношения и открыть его в другом окне редактора" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "Установить текущий выбор на списке выделенных отношений" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "Выделите участников всех выбранных отношений" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "Выбрать участников" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "Скачать с сервера всех участников выделенных отношений" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "Скачать участников" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Текущее выделение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Показать окно со списком выделенных объектов." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Приблизиться к выделенным элементам" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Приблизиться к выделенному" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Яч.: Связ.:{0} / Линий:{1} / Точек:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "выделение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Выбор: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Отсоединить панель" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Закрыть эту панель. Вы можете открыть ее снова, используя кнопки на левой " +"панели." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Щёлкните для уменьшения/увеличения содержимого панели" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Авторы" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Показать список людей, работающих с выделенными объектами." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} Автор" +msgstr[1] "{0} Автора" +msgstr[2] "{0} Авторов" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "Выбрать элементы, созданные этим пользователем" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "Открыть в браузере информацию о пользователе" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" +"Внимание: открываются страницы информации о первых {0} из {1} выделенных " +"пользователей" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" +"Не удаётся создать ссылку URL, потому что кодировка " +"''{0}''
отсутствует в этой системе." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "Отсутствует кодировка" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Автор" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "кол-во объектов" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "неполный" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "замкнутая линия" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Скачивание пакетов правок..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Это изменить {0} объект." +msgstr[0] "Это изменит {0} объект." msgstr[1] "Это изменит {0} объекта." msgstr[2] "Это изменит {0} объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "Пустое значение удаляет тег." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "<различные>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Изменить значения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5830,5 +5969,5 @@ msgstr[2] "Изменить параметры {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5838,233 +5977,71 @@ msgstr[2] "Это изменит до {0} объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Пожалуйста, выберите ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Выберите значение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Выберите объекты, для которых вы желаете изменить параметры." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Параметры/Участники" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Параметры выделенных объектов." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Член группы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Добавить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Свойств: {0} / Участников: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Параметры / Участники" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Изменить отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Удалить из отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Удалить выделенный ключ из всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Удалить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Добавить новую пару ключ/значение для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Изменить значение выбранного ключа для всех объектов" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Показать список всех отношений." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Отношения: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Открыть редактор для выбранного отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Удалить выбранное отношение" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Создать новое отношение" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "Создать копию этого отношения и открыть его в другом окне редактора" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "Установить текущий выбор на списке выделенных отношений" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "Выделите участников всех выбранных отношений" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "Выбрать участников" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "Скачать с сервера всех участников выделенных отношений" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "Скачать участников" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Текущее выделение" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Показать окно со списком выделенных объектов." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Приблизиться к выделенным элементам" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Приблизиться к выделенному" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Яч.: Связ.:{0} / Линий:{1} / Точек:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "выделение" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Выбор: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Отсоединить панель" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Закрыть эту панель. Вы можете открыть ее снова, используя кнопки на левой " -"панели." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Щёлкните для уменьшения/увеличения содержимого панели" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Авторы" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Показать список людей, работающих с выделенными объектами." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} Автор" -msgstr[1] "{0} Автора" -msgstr[2] "{0} Авторов" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "Выбрать элементы, созданные этим пользователем" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Показать информацию" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "Открыть в браузере информацию о пользователе" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" -"Внимание: открываются страницы информации о первых {0} из {1} выделенных " -"пользователей" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" -"Не удаётся создать ссылку URL, потому что кодировка " -"''{0}''
отсутствует в этой системе." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "Отсутствует кодировка" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Автор" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "кол-во объектов" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -6131,20 +6108,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Скачивание отношения ''{0}'' с сервера" -msgstr[1] "Скачивание отношения ''{0}'' с сервера" -msgstr[2] "Скачивание отношения ''{0}'' с сервера" +msgstr[0] "" +"Скачивание с сервера {0} неполный дочерний элемент отношения ''{1}''" +msgstr[1] "" +"Скачивание с сервера {0} неполных дочерних элементов отношения ''{1}''" +msgstr[2] "" +"Скачивание с сервера {0} неполных дочерних элементов отношения ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Скачать участников отношений" +msgstr "Скачивание отношений с сервера" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Скачивание отношения ''{0}'' с сервера" +msgstr "({0}/{1}: Скачивание отношения ''{2}''..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -6162,14 +6141,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Применить роль" +msgstr "Применить роль:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Введите роль для всех участников отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "Ввести роль и применить её на выделенных участников отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -6181,14 +6158,14 @@ "хотите продолжать с циклическими отношениями?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "Удалить их, почистить отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "Игнорировать их, оставить отношение как есть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -6201,9 +6178,9 @@ "участника отношения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "Несколько участников, относящихся к одному и тому же элементу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -6216,5 +6193,5 @@ "''{0}'' будет пропущено." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -6223,5 +6200,5 @@ "участником" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -6230,5 +6207,5 @@ "участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -6238,5 +6215,5 @@ "выделенным участником" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -6246,20 +6223,20 @@ "выделенного участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "Редактор отношений: удалить выделенное" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Выделить участников отношения, которые относятся к выбранным элементам" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6270,65 +6247,64 @@ "выделенных элементов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "Выделить элементы для выделенных участников отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "Сортировать участников отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Спорт" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "Сортировать" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "Редактор отношений: сортировать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "Переместить выделенных участников отношения вверх" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "Редактор отношений: поднять" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "Переместить выделенных участников отношения вниз" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "Редактор отношений: опустить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "Удалить отмеченных участников из отношения" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "Редактор отношений: удалить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "Удалить редактируемое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "Да, создать конфликт и закрыть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "Нет, продолжить редактирование" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" @@ -6337,5 +6313,5 @@ "отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6347,9 +6323,9 @@ "создать конфликт и закрыть редактор?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "Конфликт в данных" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6360,49 +6336,47 @@ "
Пожалуйста, устраните этот конфликт, прежде чем продолжать." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "Записать внесённые изменения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "Применить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "Отменить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Добавить пустой тег" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Скачать участников отношений" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "Скачать всех неполных участников" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "Редактор отношений: скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "Скачать участников отношений" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "Скачать с сервера выделенных неполных участников" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "Задать роль для выделенных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Применить роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6415,34 +6389,34 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "Да, записать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "Нет, не записывать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "Подтвердить пустую роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "Выделенный, при редактировании отношения, участник относится к" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "Задать масштаб" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "Масштабирование приближает к первому выбранному объекту" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "Масштабирование отменено, потому что слой этого отношения не активен" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "Масштабирование отменено, потому что вы не выбрали участника" @@ -6564,5 +6538,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" @@ -6570,5 +6544,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "Название места" @@ -6578,5 +6552,5 @@ msgstr "Удалить выделенные закладки" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "Переименовать выделенные закладки" @@ -6664,9 +6638,4 @@ msgid "Download Area" msgstr "Область для скачивания" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Скачать" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6970,6 +6939,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6982,6 +6949,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -7252,4 +7217,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7472,5 +7441,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7513,116 +7482,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Название" @@ -7646,15 +7615,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Тип" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "Возле" @@ -7846,11 +7815,11 @@ msgstr "Скачать историю с сервера" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" "История ещё не инициализирована. Не удалось настроить ссылку на элемент." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7859,5 +7828,5 @@ "Не удалось настроить ссылку. ID ссылки: {0} не соответствует ID истории: {1}." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7865,9 +7834,9 @@ msgstr "Не удалось настроить ссылку. Версия ссылки {0} отсутствует в истории." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "История ещё не инициализирована. Не удалось настроить текущий элемент." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7955,5 +7924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54 msgid "Changeset" -msgstr "Пакет изменений" +msgstr "Пакет правок" #. item "Ways/Cycleway" combo "Pedestrians" @@ -7984,6 +7953,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "неизвестный" @@ -8008,13 +7977,13 @@ msgstr "анонимный" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Changeset info" msgstr "Информация о пакете правок" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Launch browser with information about the changeset" msgstr "Открыть браузер с информацией о пакете правок" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -8049,4 +8018,140 @@ msgstr "Версия" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Синхронизировать только точку {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Синхронизировать только линию {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Синхронизировать только отношение {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Синхронизировать весь набор данных" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Загрузка на сервер прервана так как на сервере есть " +"более новая версия одной
из ваших точек, линий или отношений.
Причиной " +"конфликта является {0} с id {1},
версия " +"данных на сервере {2}, ваша версия {3}.

Нажмите {4}, " +"чтобы синхронизировать только конфликтный элемент.
Нажмите {5}, чтобы синхронизировать весь локальный набор данных с сервером." +"
Нажмите {6}, чтобы прервать, затем продолжите " +"редактирование.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Обнаружены конфликты" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Загрузка на сервер не удалась, так как на сервере " +"имеется более новая версия одной
из ваших точек, линий или отношений. " +"

. Нажмите на {0} для синхронизации локальных данных " +"с сервером.
Нажмите {1} чтобы прервать, затем " +"продолжите редактирование.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"Загрузка на сервер не удалась потому что вы " +"используете
пакет правок {0}, который уже был закрыт в {1}." +"
Пожалуйста, загрузите снова, используя новый или существующий открытый " +"пакет правок." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Пакет правок закрыт" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "Подготовить устранение конфликта" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "Щёлкните, чтобы скачать с сервера все родительские линии для точки {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "Щёлкните, чтобы отменить и подтвердить правку карты" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" +"Загрузка на сервер не удалась, потому что вы пытались " +"удалить точку {0}, которая ещё используется в линии {1}.

Щёлкните " +"{2}, чтобы скачать с сервера все родительские линии точки " +"{0}.
Если потребуется, JOSM создаст конфликты, которые вы сможете " +"устранить в диалоге устранения конфликтов." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "Точка ещё используется" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" +"Предупреждение: ошибка в заголовке \"{0}\" не соответствует ожидаемому " +"образцу" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Прокомментируйте данные, загружаемые на сервер:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -8065,40 +8170,155 @@ msgstr "Нет открытого пакета правок" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Открыть новый пакет правок" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" +"Открыть новый пакет правок и использовать его в следующей загрузке на сервер" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Обновление пакета правок..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Загрузить данные на сервер в уже открытый пакет правок" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "Закрыть пакет правок после загрузки на сервер" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" +"Выбрать, какой пакет правок надо закрыть, после следующей загрузки на сервер" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "Загрузите с сервера список открытых вами пакетов правок" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "Закрыть открытый пакет правок, выбранный в настоящий момент" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" "Пожалуйста, выберите пакеты правок, которые хотите закрыть" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "Открыть пакеты правок" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Закрыть пакеты правок" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "Закрыть выбранные открытые пакеты правок" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "Отменить закрытие пакетов правок" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Закрытие пакета правок" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "Закрытие пакета правок {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +#, fuzzy +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" +"Внимание: невозможно разместить диалоговое окно поверх всех окон. Исключение " +"в: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Сохранить имя пользователя и пароль (не зашифровано)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Пожалуйста, введите имя пользователя" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Введите теги, описывающие ваш трек." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Внимание: Пароль будет передан в незашифрованном виде." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Атлетика" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Достигнут перекрёсток" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "Открыть диалог выбора файла" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "Выберите имя файла" @@ -8169,5 +8389,5 @@ msgstr "Сохранение слоя в ''{0}'' ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" @@ -8175,5 +8395,5 @@ "выходом?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" @@ -8181,9 +8401,9 @@ "удалением?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "Загрузка на сервер и сохранение изменённых слоёв ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -8203,9 +8423,9 @@ "их, либо отмените изменения.
Слои с конфликтами:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "Несохранённые данные и конфликты" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -8229,9 +8449,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "Несохранённые данные и отсутствие соответствующего файла" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -8256,33 +8476,33 @@ "отмените изменения.
Слои, которые не удаётся записать в файл:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "Несохранённые данные незаписываемых файлов" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "Закрыть этот диалог и продолжить редактирование в JOSM" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Отменить и выйти" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "Выйти из JOSM без сохранения. Несохранённые изменения будут утеряны." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "Сбросить и Удалить" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "Удалить слои без сохранения. Несохранённые данные будут утеряны." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "Сохранить/Передать на сервер и Выйти" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" @@ -8290,19 +8510,19 @@ "локально или загружены на сервер." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "Сохранить/Передать на сервер и Удалить" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" "Слои сохранить локально или загрузить на сервер. Изменения не будут потеряны." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "Подготовка слоя ''{0}'' для загрузки на сервер..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -8312,5 +8532,5 @@ "правками
было отменено или не удалось." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "Неполная загрузка на сервер или не всё сохранено" @@ -8383,41 +8603,409 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Загрузить на сервер" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Обновить объекты" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Настройки" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" "Решить, как передать данные на сервер и какие использовать пакеты правок" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "Теги нового пакета правок" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "Применить теги на пакет правок, который загружен" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" +"Открыть новый пакет правок и использовать его в следующей загрузке на сервер" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "улучшенный" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Настроить доступные модули." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Загрузка данных на сервер по слою ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Загрузить изменения на сервер" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "Загрузить на сервер изменённые элементы" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" +"Пожалуйста, введите комментарий для этой загрузки на сервер пакета правок " +"(мин. 3 символа)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "неверный комментарий загрузки на сервер" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "Please enter a valid chunk size first" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "Неправильный размер куска" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "Отменить загрузку на сервер и продолжить редактирование" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Теги пакета правок {0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" +"Предупреждение: элемент ''{0}'' уже удалён на сервере. Повторная загрузка на " +"сервер будет произведена без этого элемента." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "Подготовка элементов к загрузке на сервер ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, fuzzy, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +"Пожалуйста, подтвердите удаление {0} объектов из " +"{1} отношений." +msgstr[1] "" +"Пожалуйста, подтвердите удаление {0} объектов из " +"{1} отношений." +msgstr[2] "" +"Пожалуйста, подтвердите удаление {0} объектов из " +"{1} отношений." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Загрузка данных на сервер по слою ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "Продолжить загрузку на сервер" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +#, fuzzy +msgid "Click to return to the Upload Dialog" +msgstr "Нажмите, чтобы закрыть диалог" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "О программе" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Нажмите, чтобы прервать процесс объединения точек" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Выделите объекты, которые надо загрузить на сервер" +msgstr[1] "Выделите объекты, которые надо загрузить на сервер" +msgstr[2] "Выделите объекты, которые надо загрузить на сервер" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Информация о пакете правок" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Предупреждение: объект ''{0}'' уже удалён на сервере. Данные будут переданы " +"снова на сервер, но без этого объекта." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" +"Объект ''{0}'' уже удалён. Объект будет пропущен при передаче данных на " +"сервер." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "Передача объектов на сервер. Кол-во: {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" +"Игнорирование выявленного исключения, так как загрузка на сервер отменена. " +"Исключение: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" +"Отметить изменённые объекты в текущем выборе, которые " +"надо загрузить на сервер." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" +"Отметить локально удалённые объекты, которые должны " +"быть удалены на сервере." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "Выделите объекты, которые надо загрузить на сервер" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "Отменить загрузку на сервер" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" +"Предупреждение: неожиданное значение ключа ''{0}'' в параметрах, получено " +"''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Пожалуйста, выберите ряд для удаления." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "Передать данные за один запрос" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "Upload data in chunks of objects. Chunk size: " + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "Передать на сервер по одному объекту" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" +"Открыть новый пакет правок и использовать его в следующей загрузке на сервер" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "(1 запрос)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "(# запросов неизвестно)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "({0} запрос)" +msgstr[1] "({0} запроса)" +msgstr[2] "({0} запросов)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "Неверный размер куска <= 0. Пожалуйста, введите целое > 1" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "Введите, пожалуйста целое значение > 1" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "Значение ''{0}'' не число. Пожалуйста, введите целое > 1" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Новые объекты:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Изменённые объекты:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Удаляемые объекты:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8427,5 +9015,5 @@ msgstr[2] "Добавить {0} объектов:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8435,5 +9023,5 @@ msgstr[2] "{0} объектов изменить:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8443,221 +9031,37 @@ msgstr[2] "Удалить {0} объектов:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Загрузить изменения на сервер" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "Загрузить на сервер изменённые элементы" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" -"Пожалуйста, введите комментарий для этой загрузки на сервер пакета правок " -"(мин. 3 символа)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "неверный комментарий загрузки на сервер" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Пожалуйста, введите сначала желаемые координаты" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "Отменить загрузку на сервер и продолжить редактирование" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Прокомментируйте данные, загружаемые на сервер:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "Открыть новый пакет правок" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" -"Открыть новый пакет правок и использовать его в следующей загрузке на сервер" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "Использовать открытый пакет правок" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Загрузить данные на сервер в уже открытый пакет правок" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "Закрыть пакет правок после загрузки на сервер" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" -"Выбрать, какой пакет правок надо закрыть, после следующей загрузки на сервер" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Теги пакета правок {0}" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "Загрузите с сервера список открытых вами пакетов правок" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "Закрыть открытый пакет правок, выбранный в настоящий момент" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "требуется идентификатор пакета правок > 0. Получено {0}" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Предупреждение: элемент ''{0}'' уже удалён на сервере. Повторная загрузка на " -"сервер будет произведена без этого элемента." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "Подготовка элементов к загрузке на сервер ..." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" -"Отметить изменённые объекты в текущем выборе, которые " -"надо загрузить на сервер." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" -"Отметить локально удалённые объекты, которые должны " -"быть удалены на сервере." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "Выделите объекты, которые надо загрузить на сервер" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "Отменить загрузку на сервер" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "Продолжить загрузку на сервер" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "Ошибка: не удается сохранить свойства для ''{0}''" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Загрузить все изменения на сервер одним запросом" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "Неверный запрос" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} метров" -msgstr[1] "{0} метров" -msgstr[2] "{0} метров" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Пожалуйста, введите строку фильтра" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, fuzzy, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "Файл ''{0}'' не записывается. Пожалуйста, поменяйте имя файла." - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "точка GPS" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Настроить отрисовку линий" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Использовать глобальные настройки." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Отображать линии между точками для этого слоя." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Не отображать линии между точками для этого слоя." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Выбрать варианты отрисовки линий" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8665,5 +9069,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8672,5 +9076,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8759,5 +9163,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Описание" @@ -8791,10 +9195,10 @@ msgstr[2] "{0} путевых точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Преобразовать в слой данных" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8804,12 +9208,12 @@ "считается вредоносной.
Если хотите загрузить треки, ознакомьтесь с этим:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8818,29 +9222,29 @@ msgstr "Преобразовано из: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Скачать с OSM данные вдоль этого трека" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Скачать всё в пределах:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} метров" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Максимальная область для одного запроса:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8851,9 +9255,9 @@ "Продолжить?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "На слое отсутствует трек GPX, чтобы наложить звук." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8863,5 +9267,5 @@ "будут пропущены или перенесены в начало трека." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8871,24 +9275,24 @@ "проигнорированы при рассчете времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Слой данных {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "вне области для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" "Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8898,5 +9302,5 @@ msgstr[2] "Обнаружено {0} конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8920,5 +9324,5 @@ "удалёны на сервере." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8938,11 +9342,11 @@ "конфликтов и устраните конфликты вручную." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "Нажмите, чтобы закрыть этот диалог и продолжить правку" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8952,36 +9356,36 @@ msgstr[2] "{0} удалено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} состоит из:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "отключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "Версия API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Преобразовать в слой GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "Тест согласованности набора данных" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "Проблемы не обнаружены" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "Обнаружены следующие проблемы:" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8992,5 +9396,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -9000,5 +9404,5 @@ msgstr[2] "треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -9007,5 +9411,5 @@ msgstr[2] "точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -9015,5 +9419,5 @@ msgstr[2] "трек с {0} точками" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -9023,5 +9427,5 @@ msgstr[2] "{0} состоит из {1} треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -9031,24 +9435,24 @@ msgstr[2] "{0} точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Файлы GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Файл {0} загружен под именем \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Ошибка разбора {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Невозможно прочитать \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -9056,38 +9460,38 @@ "on the photo and select a timezone

" msgstr "" -" Сделайте фото вашего GPS приемника, когда он показывает время.
" -"Покажите это фото здесь.
И потом, просто захват время которое вы " -"прочитаете на фото и выберите часовой пояс
" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +" Сделайте фото с помощью GPS приемника, когда он показывает время." +"
Покажите это фото здесь.
Затем, захватите время, которое вы " +"прочитаете на фото и выберите часовой пояс
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Время фотоснимка (из EXIF):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Время GPS (прочтите на фото вверху): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [дд/мм/гггг чч:мм:сс]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Я нахожусь в часовом поясе: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Без даты" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Открыть другое фото" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" -msgstr "Синхронизация времени с фотографией GPS-приемника" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgstr "Синхронизировать время по фотографии из GPS-приемника" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -9097,70 +9501,159 @@ "Пожалуйста, используйте запрашиваемый формат" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Недопустимая дата" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "<Не загружены треки GPX>" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "Трек GPX: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Открыть другой трек GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Авто-Угадывание" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Обновление позиции для: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Часовой пояс: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Смещение:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Я могу сфотографировать экран GPS приёмника.
Это поможет?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Обновление позиции для: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Все изображения" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Изображения без координат в заголовках Exif" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Картинки без тегов" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Ничего не выделено!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Совпало {0} из {1} фотографий с GPX треком." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Сопоставить изображения с GPX треком" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Совпадения" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Авто-Угадывание" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Недопустимый часовой пояс" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Недопустимое смещение" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Трассировка" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Часовой пояс: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Минуты: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Секунды: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Разница во времени {0} дней)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" +"Произошла ошибка во время попытки сопоставить фотографии с GPX треком. Вы " +"можете вручную совместить фотографии с помощью движков." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "Сопоставление фотографий треку прервано" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Настройка часового пояса и смещения" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "Выбранные фотографии не содержат информацию о времени." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Фотографии не содержат информацию о времени" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX трек не содержит информации о времени" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "Необходимо выбрать трек GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "Трек GPX не выделен" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -9171,9 +9664,5 @@ "Ожидаемый формат: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Недопустимый часовой пояс" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -9184,137 +9673,56 @@ "Ожидаемый формат: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Недопустимое смещение" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Надено {0} совпадений из {1} в GPX треке {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Трек GPX загружен" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "ыбранные фотографии не содержат информацию о времени." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Фотографии не содержать информацию о времени" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX трек не содержит информации о времени" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Часовой пояс: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Минуты: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Секунды: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Совпавшие {0} из {1} фотографий с GPX треком." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Разница во времени {0} дней)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Смещение между треком и фотографией: {0}м {1}с" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" -"Произошла ошибка во время попытки сопоставить фотографии с GPX треком. Вы " -"можете вручную сопоставить фотографии использую ползунки." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Сопоставление фотографий треку прервано" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Настройка часового пояса и смещения" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Значения по умолчанию" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Извлечение GPS координат из EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Запуск сканирования каталога" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "Один из выделенных файлов пуст" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." -msgstr "Загрузка фото..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +msgstr "Прочитать фотографии..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Чтение {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Не удалось получить канонический путь к каталогу {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Скнирование каталога {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Найден пустой файл в каталоге {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Ошибка чтения файлов в каталоге {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Изображения с данными о местоположении" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Коррелируют с GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -9323,52 +9731,100 @@ msgstr[2] "изображений" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} изображений имело теги GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Всегда перемещать и больше не показывать этого предупреждения" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Файл не найден" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Изображений нет" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Загрузка {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Ошибка в файле {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Показать изображения с геотегами" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "Показать изображение с геотегами" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Предыдущее" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Предыдущее изображение" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Веб-страница: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Удалить фото из слоя" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Удалить из отношения" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Следующее" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Следующее изображение" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Центрировать вид" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Масштабировать с лучшим расположением и 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -9379,5 +9835,5 @@ "Высота: {0} м" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9485,4 +9941,12 @@ msgstr "Невозможно отобразить URL" +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" @@ -9711,7 +10175,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Все" @@ -9784,6 +10247,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Вело" @@ -10182,31 +10645,93 @@ msgstr "Невозможно активировать проекцию {0}. Используется Меркатор" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Использовать прокси-сервер" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Анонимный" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Студенческое общежитие" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Порт:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Пароль" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Параметры прокси-сервера" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Адрес" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Порт" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Имя пользователя прокси-сервера" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Пароль" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "Основной адрес сервера OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "Логин (e-mail) учётной записи OSM" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Основной адрес сервера" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "Имя пользователя OSM (E-mail)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM пароль" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"ВНИМАНИЕ: Пароль хранится открытым текстом, в файле настроек." +"
Пароль передаётся на сервер открытым текстом, закодированный в URL." +"
Не используйте важные Пароли." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10521,13 +11046,13 @@ msgstr[2] "Удалить старые ключи из {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "Добавить новый тег" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "Удалить отмеченное в таблице тегов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10535,18 +11060,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Дополнительные атрибуты:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "замкнутая линия" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестный тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10557,16 +11082,16 @@ msgstr "Не удалось прочитать источник заготовок тегов: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Ошибка при разборе {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Элемент типа {0} не поддерживается." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10576,18 +11101,18 @@ msgstr[2] "Изменить {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Ничего не выделено!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Неудачный выбор!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Применить шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Изменить параметры" @@ -10616,4 +11141,12 @@ msgstr "Скачивание точек с {0} до {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +#, fuzzy +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}." + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10631,12 +11164,72 @@ "правок. Получено ''{0}''" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "Ошибка! Возможно отсутствуют теги." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Подготовка данных..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, fuzzy, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" +"Неожиданный формат новой версии изменённого элемента \"{0}\". Получено \"{1}" +"\"" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, fuzzy, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" +"Предупреждение: неожиданное значение ключа ''{0}'' в параметрах, получено " +"''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +#, fuzzy +msgid "Parsing response from server..." +msgstr "Запрос на сервер имён ..." + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "неожиданный номер столбца {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10739,10 +11332,10 @@ msgstr "Ошибка разбора: неправильная структура документа gpx" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "Неизвестный режим {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -10751,6 +11344,6 @@ "элемента." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10760,40 +11353,40 @@ msgstr "Скачивание данных OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Выборка точки с id {0} из ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Выборка линии с id {0} из ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Выборка отношения с id {0} из ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Сервер выдал ошибку 404 для id {0}. Пропускаем" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Выборка пакета точек из ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Выборка пакета линий из ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Выборка пакета отношений из ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10803,11 +11396,11 @@ "для каждого элемента" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Скачивание отношения ''{0}'' с сервера" -msgstr[1] "Скачивание отношения ''{0}'' с сервера" -msgstr[2] "Скачивание отношения ''{0}'' с сервера" +msgstr[0] "Скачивание {0} объекта с ''{1}''" +msgstr[1] "Скачивание {0} объектов с ''{1}''" +msgstr[2] "Скачивание {0} объектов с ''{1}''" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10844,34 +11437,34 @@ msgstr "Сбой при импорте NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, fuzzy, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." msgstr "отсутствует пункт настройки \"{0}\". Не могу инициализировать OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "Эта версия JOSM несовместима с настроенным сервером." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"Поддерживает протокол версии 0.5 и 0.6, тогда как сервер сообщает о " -"поддержке {0} до {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +"Поддерживается протокол версии 0.6, в то время, как сервер сказал, что он " +"поддерживает {0} до {1}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Соединение с {0} установлено используя протокол {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10881,66 +11474,77 @@ "\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "Создание пакета правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Успешно открытый пакет правок {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "требуется идентификатор пакета правок > 0. Получено {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Обновление пакета правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "Обновление пакета правок {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Закрытие пакета правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Нет пакетов правок для загрузки отличий" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Подготовка..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Загрузка на сервер..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Начало загрузки на сервер за один запрос..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Передача объектов на сервер. Кол-во: {0}..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "Ожидание 10 секунд ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Попытка {0} из {1} через {2} секунды..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "OK - пробуем ещё раз." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "Попытка {0} из {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "Текущий пакет правок пуст. Невозможно загрузить данные." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "Требуется, чтобы ID текущего пакета правок был > 0. Текущий ID: {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10969,4 +11573,14 @@ msgid "Invalid bz2 file." msgstr "bz2 файл содержит ошибки" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10977,5 +11591,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -11002,5 +11616,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -11008,5 +11622,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -11019,5 +11633,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -11028,60 +11642,6 @@ msgstr "Анализ списка пакетов правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Неправильный пароль или имя пользователя." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Внимание: Пароль будет передан в незашифрованном виде." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Сохранить имя пользователя и пароль (не зашифровано)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Введите пароль" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Войти" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "Основной адрес сервера OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "Логин (e-mail) учётной записи OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Основной адрес сервера" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "Имя пользователя OSM (E-mail)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM пароль" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"ВНИМАНИЕ: Пароль хранится открытым текстом, в файле настроек." -"
Пароль передаётся на сервер открытым текстом, закодированный в URL." -"
Не используйте важные Пароли. not as direct child of element ." msgstr "Найден элемент XML , не являющийся дочерним элементом для ." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Отсутствует обязательный атрибут ''{0}'' на линии {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "Неверное значение атрибута ''ref'' элемента . Получено {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" @@ -11211,10 +11778,10 @@ "." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "Отсутствует атрибут ''ref'' у участника отношений {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" @@ -11222,10 +11789,10 @@ "Неверное значение атрибута ''ref'' у участника отношения {0}. Получено {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Отсутствует атрибут ''type'' у участника {0} отношения {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -11235,9 +11802,9 @@ "{2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Неполная спецификация с ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." @@ -11245,10 +11812,10 @@ "Неопределённый элемент ''{0}'' обнаружен во входящем потоке. Пропущено." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Недопустимый объект с id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -11260,8 +11827,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -11273,25 +11840,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Неизвестная или неподдерживаемая версия API. Получено {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "Отсутствует атрибут ''version'' на элементе OSM с ID {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}." + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "Неверное значение для атрибута ''uid''. Получено''{0}''." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "Отсутствует нужный атрибут ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "Неверная длина значения атрибута ''{0}''. Получено ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -11300,5 +11883,5 @@ "Линия с внешним ID ''{0}'' содержит отсутствующую точку с внешним ID ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -11309,5 +11892,5 @@ "мере одна точка отсутствовала в скачанных данных." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -11316,5 +11899,5 @@ "Неизвестный тип участника отношения ''{0}'' в отношении с внешним id ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -11325,13 +11908,13 @@ "внешним id ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Подготовка данных..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "Разбор данных OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "Подготовка набора данных..." @@ -11354,20 +11937,33 @@ msgstr "Скачивание зависимых отношений..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "Чтение пакетов правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "Скачивание пакетов правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "Чтение пакета правок {0} ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." +msgstr "Скачивание пакета правок {0} ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Скачивание пакетов правок..." +msgstr[1] "Скачивание пакетов правок..." +msgstr[2] "Скачивание пакетов правок..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." msgstr "Скачивание пакета правок {0} ..." @@ -11387,7 +11983,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "недопустимое значение параметра \"index\". Текущее значение {0}" +msgstr "Ожидалось значение > 0 для параметра ''{0}'', получено {1}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -11396,10 +11992,5 @@ msgstr "Не удалось установить соединение с API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" -"Ошибка: не удалось добавить учётные данные проверки подлинности к соединению." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11454,21 +12045,25 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "недопустимое значение параметра \"index\". Текущее значение {0}" +msgstr "Значение >0 ожидалось для параметра ''{0}'', получено {1}" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 -#, fuzzy msgid "Starting to upload in chunks..." -msgstr "Начало загрузки на сервер за один запрос..." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 -#, fuzzy, java-format +msgstr "Начало передачи на сервер по кускам..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format msgid "({0}/{1}) Uploading {2} objects..." -msgstr "Передача объектов на сервер. Кол-во: {0}..." +msgstr "({0}/{1}) Передача {2} объектов..." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Загрузка данных на сервер ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Удалённые или перемещённые элементы" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11511,12 +12106,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Удалить {1} {0}" +msgstr "Удалить старый модуль {0}" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Ошибка при скачивании модуля: {0}" +msgstr "Удалить старый файл модуля {0}" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11545,5 +12140,5 @@ #, java-format msgid "Plugin {0} is no longer necessary and has been deactivated." -msgstr "" +msgstr "Модуль {0} больше не нужен и был деактивирован." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84 @@ -11664,9 +12259,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "описание отсутствует" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Подробнее" @@ -11808,4 +12403,19 @@ msgstr "Произошла ошибка при работе в JOSM" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, fuzzy, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "Ожидалось значение > 0 для параметра ''{0}'', получено {1}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "Ожидалось значение > 0 для параметра ''{0}'', получено {1}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Ожидался параметр ''{0}'' > 0, получено {1}" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -12159,6 +12769,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Загрузка треков на сервер" @@ -12244,5 +12854,5 @@ msgstr "Загрузка GPX трека на сервер" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Загрузка треков на сайт openstreetmap.org" @@ -12253,5 +12863,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Интерполяция адресов" @@ -12266,11 +12876,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Нечетные" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Четные" @@ -12281,24 +12888,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Номер" +msgstr "Числовое" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "природный" +msgstr "Актуальное" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "место" +msgstr "Примерное" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Прокат" +msgstr "Потенциальное" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -12316,7 +12919,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "внутренний сегмент" +msgstr "Увеличение:" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -12330,9 +12932,9 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226 msgid "Accuracy:" -msgstr "" +msgstr "Точность:" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238 msgid "Convert way to individual house numbers." -msgstr "" +msgstr "Преобразовать линию к отдельным номерам домов." #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307 @@ -12383,7 +12985,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 -#, fuzzy msgid "Expected valid number for address increment" -msgstr "Заявлены нечётные номера домов" +msgstr "Ожидаемое верное значение наращивания адреса" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 @@ -12437,5 +13038,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "Выбрать Feuille (слой??)" @@ -12501,21 +13102,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Выберите коммуну" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Выбрать из..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Кадастр" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Авто источники" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12527,13 +13128,13 @@ "Вы хотите назначить на клавишу F11 функцию захвата?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "Восстановить действие захватывающей клавиши F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM остановлено для того, чтобы проявились изменения." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12560,17 +13161,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "Отменить обрезку изображения во время геопривязки" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Включить автоматическое кеширование." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Макс. размер кеша (МБ)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12588,18 +13189,18 @@ "данных, созданный этим модулем." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "WMS французского кадастра" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Значение тега \"source\" когда включенs автоисточники" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Источник" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12608,5 +13209,5 @@ "Заменить оригинальный белый фон на цвет фона, определенные в настройках JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12616,54 +13217,51 @@ "Полезно для текстов на темном фоне." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Позволяет соединять несколько слоев" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Установить прозрачность слоев WMS. С право непрозрачный, слева прозрачный." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Нарисовать прямоугольник вокруг данных, скачанных с сервера WMS." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "Векторные изображения захватить мультипликатором:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Взять мелкие изображения (высокое качество, но использует больше памяти)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Фиксированный размер площади (по умолчанию 100 м)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Фиксированный размер (от 25 до 1000 метров)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "Растровые изображения захватить мультипликатором:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "Показать перекрестья:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Более старые файлы автоматически удаляются, когда этот размер превышен" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Добавлен источник авто-тега:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Добавить \"source=...\" к элементам?" @@ -12883,5 +13481,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Расположение" @@ -13083,5 +13681,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Никаких данных не загружено" @@ -13103,9 +13701,9 @@ msgstr "Преобразовать в GPX слой с обезличенным временем" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "Править GPX треки" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "РедакторGpx" @@ -13494,7 +14092,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "вода" @@ -13658,19 +14256,19 @@ msgstr "Невозможно получить изображение" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Подключение" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Подключено" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Не подключено" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Ошибка при подключении" @@ -13709,33 +14307,33 @@ msgstr "Слой LiveGPS" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Захват трека GPS" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" "Связаться с сервером gpsd и показать текущее положение на слое LiveGPS." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Центрировать" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Центрировать слой LiveGPS на текущей позиции" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Авто-центровка" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Продолжить центрировать слой LiveGPS на текущей позиции" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13786,9 +14384,9 @@ msgstr "Действие невыполнимо за пределами мира." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "Режим измерения" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Измерения" @@ -13828,5 +14426,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13837,13 +14435,13 @@ msgstr "Создать мультиполигон." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "Одна из выделенных линий уже является частью другого мультиполигона." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "Мультиполигон должен состоять только из замкнутых линий." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "Вы должны выделить, как минимум, две линии." @@ -13996,5 +14594,5 @@ msgstr "исполняемый файл Firefox" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "PicLayer" @@ -14038,7 +14636,7 @@ "talking to the plugin." msgstr "" -"Модуль дистанционного управления всегда слушает порт 8111 на localhost. " -"Номер порта нельзя изменить, так как он является стандартным для сторонних " -"приложений, подключающихся к модулю." +"Модуль Remote Control всегда слушает порт 8111 на localhost. Номер порта " +"нельзя изменить, так как он является стандартным для сторонних приложений, " +"подключающихся к модулю." #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41 @@ -14092,5 +14690,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -14166,41 +14764,41 @@ msgstr "Введите значение толщины" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Интерактивная карта" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "Автомасштабирование" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Загрузить квадрат карты" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "Показать данные квадрата" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Скачать все квадраты карты" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Приблизить" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Отдалить" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "Привязаться к размеру квадрата" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "Очистить кеш квадрата карты" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "изображение " @@ -14375,4 +14973,43 @@ "В первую очередь Вы должны указать в настройках источники заготовок тегов." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Четные" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Минимальный номер" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Максимальный номер" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Улицы" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Максимальный номер" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -14391,42 +15028,20 @@ msgstr "Обратный ряд домов вдоль улицы" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Ряд домов вдоль улицы" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Создать отдельные здания из длинного здания" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Выберите одну замкнутую линию, содержащую, не менее четырёх точек." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Ряд домов вдоль улицы" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Максимальный номер" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Минимальный номер" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Интерполяция" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Название улицы" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Необязательно" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14441,5 +15056,5 @@ msgstr "Проверка не выявила ошибок" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Сетка" @@ -15109,38 +15724,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "здание" @@ -15154,5 +15739,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "полигон" @@ -15273,10 +15858,10 @@ "Невозможно прочитать информацию из \"walking-papers.org\" по id \"{0}\"" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Walking Papers: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15683,4 +16268,6 @@ "option to automatically generate individual house number nodes from a Way." msgstr "" +"Группа обычной интерполяции адресов вводится в одном диалоге, также, как " +"опция автоматической генерации отдельных номеров домов точек из линии." #. Plugin cadastre-fr @@ -16052,6 +16639,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Сноска" @@ -16497,5 +17084,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Ширина (метры)" @@ -16613,5 +17200,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "металл" @@ -16623,5 +17210,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "лес" @@ -16879,4 +17466,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16908,8 +17498,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "да" @@ -17057,9 +17649,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "нет" @@ -17304,5 +17897,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "дорога местного значения" @@ -17337,5 +17930,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "служебный проезд" @@ -17369,6 +17962,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "строящаяся дорога" @@ -17418,5 +18011,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "Круг" @@ -17604,6 +18197,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Туризм" @@ -17724,5 +18317,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17748,4 +18340,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17755,15 +18348,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Оператор" @@ -17975,7 +18568,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Возвышение" @@ -18394,5 +18987,5 @@ msgstr "трясина" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -18402,5 +18995,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "Болото" @@ -18926,32 +19519,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Часы работы" @@ -19010,91 +19603,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "24/7" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "Пн-Пт 08:30-20:00" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Вт-Вс 08:00-15:00; Sa 08:00-12:00" @@ -19109,5 +19702,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -19126,7 +19719,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Справочный номер" @@ -19142,5 +19735,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "подземная" @@ -19153,6 +19746,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Денежный сбор" @@ -19192,22 +19785,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Магазин" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Править автомагазин" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Мастерская" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Править автомастерскую" @@ -19215,5 +19796,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Прокат" @@ -19222,10 +19803,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Править прокат авто" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Совместное использование" @@ -19233,5 +19814,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Править совместное использование" @@ -19239,10 +19820,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Править стоянку для велосипедов" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Вместимость" @@ -19251,22 +19832,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Править прокат велосипедов" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Править веломастерскую" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Общественный транспорт" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -19276,5 +19850,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -19282,5 +19856,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Справка" @@ -19288,5 +19862,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Полустанок" @@ -19294,5 +19868,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Править полустанок" @@ -19300,5 +19874,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Трамвайная остановка" @@ -19307,5 +19881,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Править трамвайную остановку" @@ -19313,5 +19887,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Ж/Д платформа" @@ -19320,5 +19894,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Править ж/д платформу" @@ -19330,5 +19904,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Справка (номер платформы)" @@ -19336,10 +19910,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Полигон" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Вход в метро" @@ -19348,10 +19922,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Править вход в метро" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Кресло-каталка" @@ -19360,5 +19934,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Автовокзал" @@ -19367,5 +19941,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Править автовокзал" @@ -19373,5 +19947,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Автобусная остановка" @@ -19381,5 +19955,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Править автобусную остановку" @@ -19388,17 +19962,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Навес" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Скамейка" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Автобусная платформа" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Править автобусную платформу" @@ -19406,5 +19988,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Такси" @@ -19412,5 +19994,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Править стоянку такси" @@ -19418,5 +20000,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Аэропорт" @@ -19424,15 +20006,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Править Аэродром" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "Международная ассоциация воздушного транспорта" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "Международная организация гражданской авиации" @@ -19440,10 +20022,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Путешествие" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Проживание" @@ -19455,5 +20037,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Гостиница" @@ -19462,15 +20044,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Править Гостиницу" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Звёзды" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Мотель" @@ -19478,20 +20060,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Править Мотель" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Домик для гостей" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Править Домик для гостей" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Дача/Коттедж" @@ -19499,10 +20081,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Править Дачу/Коттедж" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Студенческое общежитие" @@ -19510,30 +20092,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Править студенческое общежитие" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Альпийский шалаш" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Править Альпийский шалаш" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Площадка для домов на колёсах" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Править площадку для домов на колёсах" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Кэмпинг" @@ -19541,10 +20123,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Править Кемпинг" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Питание" @@ -19555,5 +20137,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Ресторан" @@ -19561,5 +20143,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Править Ресторан" @@ -19567,5 +20149,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Кухня" @@ -19573,61 +20155,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "итальянская" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "китайская" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "пицца" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "бургеры" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "греческая" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "немецкая" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "индийская" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "местная" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "кебаб" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "турецкая" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "азиатская" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "тайская" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "мексиканская" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "японская" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Ларёк с едой" @@ -19635,9 +20217,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Править Ларёк с едой" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Кафе" @@ -19645,9 +20227,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Править Кафе" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Бар" @@ -19655,18 +20237,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Править Бар" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Пивная" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Править Пивную" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Закусочная" @@ -19674,9 +20256,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Править Закусочную" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Ночной клуб" @@ -19684,24 +20266,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Править Ночной клуб" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Туризм" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Достопримечательность" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Править Достопримечательность" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Музей" @@ -19709,9 +20291,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Править Музей" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Зоопарк" @@ -19720,9 +20302,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Править Зоопарк" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Смотровая площадка" @@ -19730,24 +20312,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Править Смотровую площадку" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Каланча" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Парк развлечений" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Править Парк развлечений" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Рисунки" @@ -19755,5 +20337,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Править Картинную галлерею" @@ -19761,19 +20343,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Справочное бюро" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Карта" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "Уровень детализации" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "топографический" @@ -19811,5 +20393,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19817,28 +20399,28 @@ msgstr "улица" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "схема" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "Показанная область" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "место" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "город" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "регион" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Ближайшее описание" @@ -19848,5 +20430,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "Маршруты показаны для:" @@ -19854,6 +20436,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Велоспорт" @@ -19861,5 +20443,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "Езда на горных велосипедах" @@ -19867,6 +20449,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Лыжный спорт" @@ -19874,5 +20456,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "Катание" @@ -19880,46 +20462,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "... другие возможные способы передвижения" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Информационный стенд" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "Содержимое указателя" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "указатель" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "история" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "природа" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "животный мир" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "растения" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "Пост проводника" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "Информационная стойка" @@ -19927,29 +20509,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "Примерное описание" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1769 msgid "Audioguide" msgstr "Аудиогид" #. -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" msgstr "Аудиогид через мобильный телефон?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 +#: build/trans_presets.java:1780 msgid "Phone number" msgstr "Номер телефона" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Другие справочные бюро" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Править Навес" @@ -19957,25 +20539,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Очаг" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Место для пикника" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Править Место для пикника" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Исторические места" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Замок" @@ -19984,19 +20566,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Править Замок" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Руины" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Править Руины" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Место раскопок" @@ -20005,9 +20587,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Править Место раскопок" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Поле битвы" @@ -20015,10 +20597,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Править Поле битвы" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "Место раскопок" @@ -20026,5 +20608,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "Править место раскопок" @@ -20032,15 +20614,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Памятник" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Править Памятник" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Мемориал" @@ -20048,55 +20630,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Править Мемориал" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Придорожный крест" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Править придорожный крест" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Придорожная святыня" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Править придорожную святыню" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "Пограничный камень" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "Править Пограничный камень" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Досуг" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Аквапарк" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Править Аквапарк" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Игровая площадка" @@ -20104,35 +20686,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Править Игровую площадку" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Рыбалка" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Править Место для рыбалки" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Спорт" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Спортивные учреждения" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Стадион" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Править Стадион" @@ -20146,6 +20728,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "вид спорта:" @@ -20537,30 +21119,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "спорт" @@ -20570,225 +21152,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "несколько" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "стрельба из лука" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "атлетика" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "австралийский футбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "бейсбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "баскетбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "ж/д пути" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "изгибаться" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "каноэ" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "альпинизм" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "крикет" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "крикет_сеть" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "крокет" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "велоспорт" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "собачьи бега" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "наездник" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "футбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "гольф" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "гимнастика" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "хоккей" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "лошадиные бега" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "машина" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "пелота" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "производить шум" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "рэгби" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "стрельба" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "скейтборд" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "фигурное катание" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "лыжный спорт" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "футбол" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "плавание" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "настольный теннис" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "теннис" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Спортивный центр" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Править спортивный центр" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Спортивное поле" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Править спортивное поле" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Трек" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Править трек" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Поле для гольфа" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Править Поле для гольфа" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Минигольф" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Править Минигольф" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Спорт" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Несколько" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Править Многоборье" @@ -20827,21 +21409,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "тип" @@ -20880,203 +21462,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "спортивное поле" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "спортивный центр" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "стадион" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "трек" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "10штырьковый" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Править Кегельбан" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Атлетика" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Править Атлетику" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Стрельба из лука" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Править Стрельбу из лука" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Скалолазанье" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Править Скалолазанье" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Каноэ" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Править Каноэ" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Править Велоспорт" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Собачьи бега" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Править Собачьи бега" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Наездник" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Править Наездника" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Лошадиные бега" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Править лошадиные бега" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Гимнастика" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Править Гимнастику" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Моторные виды спорта" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Править моторные виды спорта" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Фигурное катание" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Править Фигурное катание" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Скейтборд" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Править Скейтборд" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Плавание" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Править Плавание" @@ -21084,56 +21666,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Править Лыжный сопрт" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Тип лыжня" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "спуск" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "лыжный спорт" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "снежный городок" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Сложность" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "новичок" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "лёгкий" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "Промежуточный" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "улучшенный" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "эксперт" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "свободный" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Стрельба" @@ -21141,182 +21723,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Править Тир" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Спорт (с мячом)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Футбол" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Править Футбол" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Американский футбол" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Править Американский футбол" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Австралийский футбол" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Править Австралийский футбол" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Бейсбол" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Править Бейсбол" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Баскетбол" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Править Баскетбол" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Гольф" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Править Гольф" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "поле для гольфа" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Рубин" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Править Бочче" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Стадион" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Править Боулз" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Крикет" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Править Крикет" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Крикет сети" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Править Крикет сети" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Крокет" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Править Крокет" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Хоккей" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Править Хоккей" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Пелота" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Править Пелота" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Ракетка" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Править Ракетка" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Регби" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Править рэгби" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Настольный теннис" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Править Настольный теннис" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Теннис" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Править Теннис" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "Рукотворное" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Здания" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Здание" @@ -21324,5 +21906,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Общественное здание" @@ -21330,10 +21912,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Править Общественное здание" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Муниципалитет" @@ -21341,10 +21923,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Править здание муниципалитета" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Посольство" @@ -21352,10 +21934,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Править посольство" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Здание суда" @@ -21364,10 +21946,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Править здание суда" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Тюрьма" @@ -21376,10 +21958,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Править Тюрьму" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Полиция/Милиция" @@ -21389,10 +21971,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Править Полицию" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Пожарное депо" @@ -21401,10 +21983,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Править Пожарное депо" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Почтовое отделение" @@ -21412,5 +21994,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Править Почтовое отделение" @@ -21418,15 +22000,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Детский сад" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Править Детсад" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Школа" @@ -21434,10 +22016,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Править Школу" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Университет" @@ -21445,10 +22027,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Править Университет" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Колледж" @@ -21456,5 +22038,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Править Колледж" @@ -21462,5 +22044,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Кинотеатр" @@ -21469,10 +22051,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Править Кинотеатр" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Библиотека" @@ -21481,9 +22063,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Править Библиотеку" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Центр искусств" @@ -21491,10 +22073,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Править центр искусств" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Театр" @@ -21503,10 +22085,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Править Театр" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Место поклонения" @@ -21516,5 +22098,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Править Место поклонения" @@ -21523,6 +22105,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Религия" @@ -21531,66 +22113,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "Бахаи" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "Буддизм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "Христианство" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "Индуизм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "Джайнизм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "Иудаизм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "Мусульманство" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "сикхизм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "Спиритуализм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "Даосизм" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "унитарный" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "зороастризм" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Конфессия" @@ -21599,81 +22181,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "Англиканская" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "Баптизм" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "Католическая" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "Евангельская" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "Свидетели Иеговы" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "Лютеранство" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "Методизм" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "Мормон" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "Православие" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "пятидесятник" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "пресвитерианин" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "Протестантизм" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "квакер" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "шиизм" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "суннизм" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Адреса" @@ -21682,5 +22264,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Править адреса" @@ -21688,5 +22270,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Номер дома" @@ -21694,20 +22276,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Название дома" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Название улицы" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Название города" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Почтовый индекс" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Код страны" @@ -21716,5 +22303,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Править интерполяцию адресов" @@ -21722,61 +22309,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Схема нумерации" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "нечётные" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "чётные" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "алфавитный" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Рукотворное" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Цеха" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Править Чеха" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Башня" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Править Башню" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "Тип вышки" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "связная" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "наблюдательная" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "Высота (в метрах)" @@ -21784,25 +22371,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Водонапорная башня" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Править Водонапорную башню" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Газгольдер" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Править Газгольдер" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Маяк" @@ -21810,10 +22397,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Править Маяк" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Ветряная мельница" @@ -21821,10 +22408,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Править Ветряную мельницу" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Трубопровод" @@ -21833,37 +22420,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Править Трубопровод" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "нефтяная" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "газ" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "канализационная" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "для нагрева воды" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "любого назначения" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "подводная" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "надземная" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Очистные сооружения" @@ -21873,10 +22460,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Править Очистные сооружения" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Кран" @@ -21884,10 +22471,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Править Кран" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Буй" @@ -21895,10 +22482,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Править Буй" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Точка наблюдений" @@ -21906,10 +22493,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Править точку наблюдений" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Видеонаблюдение" @@ -21917,5 +22504,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Править Видеонаблюдение" @@ -21923,5 +22510,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Электростанция" @@ -21931,35 +22518,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Править Электростанцию" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "энергия ветра" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "энергия воды" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "энергия сгорания топлива" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "атомный" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "уголь" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" -msgstr "энергия солнца" +msgstr "солнечная батарея" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Электроподстанция" @@ -21968,10 +22555,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Править электроподстанцию" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Трансформаторная будка" @@ -21980,5 +22567,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Править трансформатор" @@ -21986,10 +22573,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "электролиния" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Опора ЛЭП" @@ -22000,23 +22587,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Править Опору ЛЭП" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "вышка" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "столб" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "Ссылка вышки" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Линия электропередач" @@ -22025,75 +22612,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Править линию электропередач" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "Тип линии" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "линия" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "minor_line" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Напряжение" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "Напряжение на кабелях" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "Количество проводов (точнее: жил) внутри кабеля" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "одножильный" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "двухжильный" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "трёхжильный" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "четырёхжильный" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Удобства" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Туалеты" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Примечание" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Почтовый ящик" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Телефон" @@ -22102,5 +22689,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Править телефон" @@ -22108,5 +22695,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Монеты" @@ -22114,5 +22701,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Банкноты" @@ -22120,5 +22707,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Электронные средства оплаты" @@ -22126,5 +22713,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Дебитные карты" @@ -22132,15 +22719,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Кредитные карты" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Телефонные карты" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Переработка отходов" @@ -22149,5 +22736,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Править переработку отходов" @@ -22155,68 +22742,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Батарейки" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Консервные банки" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Одежда" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Стекло" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Бумага" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Металлолом" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Скамейка" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "Кресло" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "Материал" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "камень" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "пластик" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "Цвет" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "чёрный" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "коричневый" @@ -22287,39 +22869,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "зеленый" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "красный" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "синий" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "серый" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "белый" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "Крепление сидений" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Охотничий стенд" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Править охотничий стенд" @@ -22328,30 +22910,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Высота" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "низкий" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "средний" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "полный" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Укрытие" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Заблокирован" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Фонтан" @@ -22360,10 +22942,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Править фонтан" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Питьевая вода" @@ -22372,10 +22954,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Править Источник воды" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Детская комната" @@ -22383,33 +22965,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Править Детскую комнату" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Магазины" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Править автомагазин" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Трассировщик озёр" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Править веломастерскую" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Супермаркет" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Править Супермаркет" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "Аптека" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "Править Аптеку" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Продуктовый магазин" @@ -22417,9 +23023,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Править продуктовый магазин" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Киоск" @@ -22427,27 +23033,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Править Киоск" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "Книжный магазин" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "Править книжный магазин" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Туристическое агенство" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Править Турбюро" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Торговый автомат" @@ -22455,5 +23061,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Править торговый автомат" @@ -22461,88 +23067,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Реализуемая продукция" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "билеты на общественный транспорт" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "план общественного транспорта" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "билеты на парковку" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "еда" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "напитки" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "сладости" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "сигареты" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "фотографии" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "еда для животных" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "газеты" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "игрушки" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "марки" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-карты" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "телефонные ваучеры" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "ваучеры" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "презервативы" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "тампоны" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "пакеты для экскрементов" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Счета или карты лояльности" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Мясная лавка" @@ -22550,9 +23156,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Править Мясную лавку" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Булочная" @@ -22560,9 +23166,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Править Булочную" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Флорист" @@ -22570,18 +23176,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Править Цветочный магазин" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Цветочный" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Править Зоотовары" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Алкоголь" @@ -22589,54 +23195,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Править Магазин алкогольной продукции" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Напитки" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Править Магазин напитков" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Компьютер" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Править Магазин компьютеров" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Электроника" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Редактиновать Магазан электрнонной техники" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Звуковая аппаратура" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Править Магазин звуковой аппаратуры" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Мебельный" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Править мебельный магазин" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Садовый магазин" @@ -22644,9 +23250,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Править Садовый магазин" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Оборудование" @@ -22654,9 +23260,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Править Магазин оборудования" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Строительный магазин" @@ -22664,54 +23270,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Править строительный магазин" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Канцтовары" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Править Магазин канцтоваров" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Парикмахерская" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Править парихмахерскую" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Обувь" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Править Обувной магазин" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Игрушки" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Править Магазин игрушек" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Видео" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Править Магазин видеозаписей" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Химчистка" @@ -22719,9 +23325,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Править Химчистку" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Прачечная" @@ -22729,9 +23335,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Править Прачечную" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Товары для активного отдыха" @@ -22739,28 +23345,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Править магазин товаров для активного отдыха" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Править Спортивный магазин" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Оптик" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Править оптику" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Наличные" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Банк" @@ -22768,14 +23374,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Править Банк" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Банкомат" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Обмен валют" @@ -22783,5 +23389,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Править Обмен валют" @@ -22789,15 +23395,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Править Банкомат" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Здоровье" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Врач" @@ -22805,18 +23411,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Править врача" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Стоматолог" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Править стоматологию" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Аптека" @@ -22824,5 +23430,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Править Аптеку" @@ -22830,9 +23436,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Отпуск лекарств по рецептам" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Больница" @@ -22840,10 +23446,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Править Больницу" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Пункт вызова экстренной помощи" @@ -22852,5 +23458,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Править Пункт вызова экстренной помощи" @@ -22859,20 +23465,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Номер пункта" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Название точки" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Номер телефона" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Используйте международный код, например: +7-916-0857403)" @@ -22880,5 +23486,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Ветеринар" @@ -22887,64 +23493,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Править ветеринара" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "География" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Места" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Континент" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Править континент" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Страна" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Править Страну" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Штат" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Править Штат" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Область" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Править Область" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Графство" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Править Графство" @@ -22952,15 +23558,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Город (более 100 000)" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Править Город" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Город (до 100 000)" @@ -22968,10 +23574,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Править город" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Пригород" @@ -22979,25 +23585,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Править Пригород" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Село" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Править Село" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Деревня" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Править деревню" @@ -23005,5 +23611,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Местность" @@ -23011,10 +23617,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Править Местность" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Остров" @@ -23022,10 +23628,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Править Остров" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "Островок" @@ -23033,5 +23639,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "Править Островок" @@ -23039,5 +23645,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Вход в пещеру" @@ -23045,10 +23651,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Править Вход в пещеру" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Вершина" @@ -23056,10 +23662,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Править Вершину" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Ледник" @@ -23067,10 +23673,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Править Ледник" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Вулкан" @@ -23078,70 +23684,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Править Вулкан" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Границы" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Государственная" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Править Государственную границу" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Административная" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Править Административную границу" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Гражданская" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Править Гражданскую границу" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Политическая" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Править Политическую границу" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Национальный парк" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Править национальный парк" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Землепользование" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Дерево" @@ -23150,15 +23756,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Править дерево" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Научное название" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Лесистая местность" @@ -23167,5 +23773,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Править лесистую местность" @@ -23173,17 +23779,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "Хвойный" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "Лиственный" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "Смешанный" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Лес" @@ -23192,14 +23798,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Править Лес" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Заповедник" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Править Заповедник" @@ -23207,25 +23813,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Каменистая осыпь" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Править Каменистую осыпь" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Кустарник" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Править Кустарник" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Вырубленный лес" @@ -23233,10 +23839,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Править Вырубленный лес" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Пустошь" @@ -23244,5 +23850,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Править Пустырь" @@ -23250,5 +23856,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Двор фермы" @@ -23257,45 +23863,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Править Двор фермы" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Обрабатываемая земля" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Править обрабатываемую землю" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Луг" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Править Луг" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Виноградник" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Править Виноградник" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Огороды" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Править Сады-огороды" @@ -23303,25 +23909,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Сад" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Править Сад" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Трава" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Править Лужайку" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Село" @@ -23329,10 +23935,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Править Село" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Общее" @@ -23340,20 +23946,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Править Общественные земли" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Парк" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Править Парк" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Спортплощадка" @@ -23361,5 +23967,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Править Спортплощадку" @@ -23367,15 +23973,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Жилая зона" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Править Жилую зону" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Церковное кладбище" @@ -23383,9 +23989,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Править церковное кладбище" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Кладбище" @@ -23393,39 +23999,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Править Кладбище" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Розничная торговля" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Править розничную торговлю" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Коммерция" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Править Офисный район" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Промышленность" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Править Промышленный район" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Территории железных дорог" @@ -23433,15 +24039,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Править Территорию железных дорог" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Военное" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Править Военную зону" @@ -23449,55 +24055,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Стройплощадка" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Править Стройплощадку" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Пустырь с развалинами" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Править пустырь с развалинами" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Пустырь" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Править пустырь" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Свалка" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Править свалку" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Карьер" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Править карьер" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Область с вложениями" @@ -23507,5 +24113,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Править область с вложениями" @@ -23514,10 +24120,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "внешний сегмент" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "внутренний сегмент" @@ -23525,5 +24131,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Ограничение на поворот" @@ -23532,5 +24138,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Править ограничение на поворот" @@ -23538,34 +24144,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Ограничение" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "поворот налево запрещён" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "поворот направо запрещён" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "движение прямо запрещено" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "разворот запрещён" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "движение только направо" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "движение только налево" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "движение только прямо" @@ -23574,15 +24180,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "от линии" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "через точку или линию" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "до линии" @@ -23590,5 +24196,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Маршрут" @@ -23597,5 +24203,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Править маршрут" @@ -23603,5 +24209,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Тип маршрута" @@ -23673,24 +24279,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "велосипедный" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "автобусный" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "трасса" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "паромный" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "лыжный" @@ -23743,5 +24349,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23750,13 +24356,13 @@ msgstr "пеший" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "туристический" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "трамвайный" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "объездной" @@ -23770,10 +24376,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "линия метро" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Описание символа" @@ -23781,31 +24387,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Сеть" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "Состояние маршрута" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "планируемый" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "альтернативный" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "временный" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "соединяющий" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Цвет (hex)" @@ -23814,30 +24420,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "сегмент маршрута" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "сегмент вперёд" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "сегмент назад" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "конечная точка" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "конечная вперёд" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "конечная назад" @@ -24048,130 +24654,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -24188,98 +24668,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "уменьшать" @@ -24656,7 +25045,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "трек автодороги" @@ -24720,13 +25109,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "железная дорога" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24742,5 +25210,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "услуги" @@ -24754,5 +25222,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "брод" @@ -24773,5 +25241,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "кольцо" @@ -24786,5 +25254,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "пункт_неотложной_помощи" @@ -24799,5 +25267,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "берег реки" @@ -24811,5 +25279,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "поток" @@ -24823,5 +25291,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "док" @@ -24843,16 +25311,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "акведук" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24949,4 +25405,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25015,13 +25478,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "искусственный" @@ -25067,6 +25530,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -25083,7 +25546,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "ж/д точка" @@ -25106,10 +25569,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "другая жд дорога" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "жд дорога сверху" @@ -25145,11 +25608,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "Старая жд дорога" #. color rail +#. #. 1 #. 50000 @@ -25190,6 +25654,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "воздушная трасса" @@ -25203,5 +25667,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "пассажирский терминал" @@ -25223,5 +25687,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "тёмная воздушная трасса" @@ -25235,5 +25699,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "светлая воздушная трасса" @@ -25241,4 +25705,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -25288,7 +25759,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "канатная дорога" @@ -25305,5 +25776,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "легкая трасси" @@ -25318,5 +25789,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "промежуточная трасса" @@ -25331,5 +25802,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "продвинутая трасса" @@ -25344,5 +25815,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "специалист лыжной трассы" @@ -25357,5 +25828,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "бесплатная трасса" @@ -25370,5 +25841,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "трасса для новичков" @@ -25488,11 +25959,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "энергия" @@ -25506,5 +25977,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "плотина" @@ -25518,5 +25989,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "трубопровод" @@ -25644,12 +26115,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "свободное время" @@ -25663,5 +26151,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "гавань" @@ -25699,4 +26187,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25715,4 +26219,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25733,8 +26245,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "использование" @@ -25836,10 +26350,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "режим использования" @@ -26093,5 +26607,5 @@ #. #. -#. +#. #. color health #. @@ -26237,4 +26751,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -26254,23 +26776,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "легкое использование" @@ -26302,6 +26824,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "прозрачная_вода" @@ -26362,14 +26884,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "здоровье" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26716,5 +27238,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26737,5 +27258,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "магазин" @@ -26807,8 +27329,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "отель" @@ -26909,9 +27431,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "туристический" @@ -26999,9 +27521,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "исторический" @@ -27015,5 +27537,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "карьер" @@ -27027,5 +27549,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "мусорная свалка" @@ -27047,5 +27569,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "водоём" @@ -27059,5 +27581,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "лес" @@ -27071,5 +27593,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "двор фермы" @@ -27092,5 +27614,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "розничная продажа" @@ -27104,5 +27626,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "промышленный" @@ -27116,5 +27638,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "заброшенная застройка" @@ -27128,5 +27650,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "участок для застройки" @@ -27140,5 +27662,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "жд разъезд" @@ -27195,7 +27717,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "военный" @@ -27209,5 +27731,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "кладбище" @@ -27220,5 +27742,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "пик" @@ -27233,5 +27755,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "ледник" @@ -27245,5 +27767,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "вулкан" @@ -27298,8 +27820,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "природный" @@ -27313,5 +27835,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "кустарник" @@ -27325,5 +27847,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "здоровье" @@ -27337,5 +27859,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "лес" @@ -27349,5 +27871,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "грязь" @@ -27361,5 +27883,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "пляж" @@ -27437,8 +27959,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "маршрут" @@ -27486,7 +28008,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "граница" @@ -27636,11 +28158,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "место" @@ -27688,6 +28210,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "адрес" @@ -28044,125 +28566,112 @@ msgstr "Sicily - Италия" +#~ msgid "Updating primitive" +#~ msgstr "Обновление элемента" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Отсутствует закрывающая скобка" + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''" - -#~ msgid "Download all incomplete ways and nodes in relation" -#~ msgstr "Скачать недостающие части линий и точки, участвующие в отношении" +#~ "Текущее число изменений превысило максимальное, текущее - {0}, " +#~ "максимальное - {1}" + +#~ msgid "User with the same uid but different name found" +#~ msgstr "" +#~ "Найден пользователь с тем же идентификатором пользователя, но с другим " +#~ "именем" + +#~ msgid "Use an open changeset" +#~ msgstr "Использовать открытый пакет правок" #~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Включите, чтобы загрузить на сервер все изменения за один запрос или " -#~ "отключите, чтобы делать отдельный запрос для каждого изменённого элемента" - -#~ msgid "Images for {0}" -#~ msgstr "Изображения для {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Прочесть GPX" - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Нет указания времени для точки {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Невозможно прочесть время \"{0}\" у точки {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Не найдено изображений с информацией о времени." - -#~ msgid "GPS start: {0}" -#~ msgstr "Начало GPS: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "Конец GPS: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "текущая разница: {0} с." - -#~ msgid "timezone difference: " -#~ msgstr "разница в часовых поясах: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} в пределах трека" - -#~ msgid "Sync clock" -#~ msgstr "Синхронизация часов" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Невозможно прочесть дату из файла \"{0}\"" - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "EXIF файла \"{0}\" не содержит информации о времени." - -#~ msgid "Image" -#~ msgstr "Изображение" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Часовой пояс GPS объекта (отличается от фотографии)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Синхронизировать время с GPS приёмником" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Введённое время невозможно использовать" - -#~ msgid "" -#~ "WARNING: no API version defined for data to upload. Falling back to " -#~ "version 0.6" +#~ "Я могу сфотографировать экран GPS приёмника.
Это поможет?" + +#~ msgid "All images" +#~ msgstr "Все изображения" + +#~ msgid "Images with no exif position" +#~ msgstr "Изображения без координат в заголовках Exif" + +#~ msgid "Not yet tagged images" +#~ msgstr "Картинки без тегов" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Надено {0} совпадений из {1} в GPX треке {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "Трек GPX загружен" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Смещение между треком и фотографией: {0}м {1}с" + +#~ msgid "Default Values" +#~ msgstr "Значения по умолчанию" + +#~ msgid "Enable proxy server" +#~ msgstr "Использовать прокси-сервер" + +#~ msgid "Anonymous" +#~ msgstr "Анонимный" + +#~ msgid "Proxy server host" +#~ msgstr "Адрес" + +#~ msgid "Proxy server port" +#~ msgstr "Порт" + +#~ msgid "Proxy server username" +#~ msgstr "Имя пользователя прокси-сервера" + +#~ msgid "Proxy server password" +#~ msgstr "Пароль" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "Ошибка! Возможно отсутствуют теги." + +#~ msgid "Preparing data..." +#~ msgstr "Подготовка данных..." + +#~ msgid "Preparing..." +#~ msgstr "Подготовка..." + +#~ msgid "Uploading..." +#~ msgstr "Загрузка на сервер..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Неправильный пароль или имя пользователя." + +#~ msgid "Enter Password" +#~ msgstr "Введите пароль" + +#~ msgid "Login" +#~ msgstr "Войти" + +#~ msgid "Error: failed to add authentication credentials to the connection." #~ msgstr "" -#~ "Предупреждение: нет версии API предназначенной для загрузки данных на " -#~ "сервер. Возврат к версии 0.6" - -#~ msgid "" -#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to " -#~ "use diff uploads, but API is not able to handle them. Ignoring diff " -#~ "upload." -#~ msgstr "" -#~ "ПРЕДУПРЕЖДЕНИЕ: параметр ''{0}'' или версия API ''{1}'' набора данных " -#~ "требует загрузку на сервер изменений, но API не способна выполнить это. " -#~ "Загрузка изменений на сервер будет проигнорирована." - -#~ msgid "" -#~ "Loading of {0} plugin was requested. This plugin is no longer required." -#~ msgstr "Был запрос на загрузку модуля {0}. Этот модуль бульше не нужен." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Изображения с геотегами" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Открыть изображения через AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "Настройки osm рендера" - -#~ msgid "Group common Address Interpolation inputs in a single dialog," -#~ msgstr "" -#~ "Сгруппировать ввод простой интерполяции адресов в единственный диалог," - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "Модуль геотега для JOSM. Совмещает фотографии с GPS треками или " -#~ "импортирует геотеги из EXIF фотографий." - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Несколько утилит, которые делают вашу жизнь проще: например, упростить " -#~ "линию; объединить полигоны; перейти в указанную точку." +#~ "Ошибка: не удалось добавить учётные данные проверки подлинности к " +#~ "соединению." + +#~ msgid "Auto-tag source added:" +#~ msgstr "Добавлен источник авто-тега:" + +#~ msgid "Interpolation" +#~ msgstr "Интерполяция" + +#~ msgid "Optional" +#~ msgstr "Необязательно" + +#~ msgid "Shop" +#~ msgstr "Магазин" + +#~ msgid "aqueduct" +#~ msgstr "акведук" #~ msgid "No data imported." #~ msgstr "Данные не импортированы" - -#~ msgid "File could not be found." -#~ msgstr "Файл не найден" #~ msgid "Unknown file extension." @@ -28263,4 +28772,34 @@ #~ msgstr "Тэги (пустое значение удаляет тэг)" +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Невозможно прочесть время \"{0}\" у точки {1} x {2}" + +#~ msgid "Images for {0}" +#~ msgstr "Изображения для {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Прочесть GPX" + +#~ msgid "GPS start: {0}" +#~ msgstr "Начало GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Конец GPS: {0}" + +#~ msgid "timezone difference: " +#~ msgstr "разница в часовых поясах: " + +#~ msgid "Sync clock" +#~ msgstr "Синхронизация часов" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Введённое время невозможно использовать" + +#~ msgid "Image" +#~ msgstr "Изображение" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)" + #~ msgid "name" #~ msgstr "название" @@ -28315,4 +28854,7 @@ #~ msgstr "Использовать шаблон ''{0}''" +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "EXIF файла \"{0}\" не содержит информации о времени." + #~ msgid "" #~ "Internal Error: cannot check conditions for no layer. Please report this " @@ -28331,4 +28873,7 @@ #~ msgid "Merge nodes with different memberships?" #~ msgstr "Объединить точки из разных отношений?" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Не найдено изображений с информацией о времени." #~ msgid "resolved version:" @@ -28520,4 +29065,16 @@ #~ msgstr "Ошибка разбора" +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Нет указания времени для точки {0} x {1}" + +#~ msgid "current delta: {0}s" +#~ msgstr "текущая разница: {0} с." + +#~ msgid "{0} within the track." +#~ msgstr "{0} в пределах трека" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Невозможно прочесть дату из файла \"{0}\"" + #~ msgid "OSM username (email)" #~ msgstr "Имя пользователя OSM (e-mail)" @@ -28578,4 +29135,7 @@ #~ msgid "History of Element" #~ msgstr "История элемента" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Синхронизировать время с GPS приёмником" #~ msgid "" @@ -28694,4 +29254,7 @@ #~ "загруженных элементов есть история." +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Часовой пояс GPS объекта (отличается от фотографии)" + #~ msgid "Selected makes your trace public in openstreetmap.org" #~ msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org" @@ -28736,4 +29299,7 @@ #~ msgid "Open a layer first (GPX, OSM, cache)" #~ msgstr "Открыть сначала слой (GPX, OSM, кэш)" + +#~ msgid "osmarender options" +#~ msgstr "Настройки osm рендера" #~ msgid "Remove route nodes" @@ -28949,7 +29515,4 @@ #~ msgstr "Достигнут конец линии" -#~ msgid "Reached a junction" -#~ msgstr "Достигнут перекрёсток" - #~ msgid "removing reference from way {0}" #~ msgstr "удаление ссылки из линии {0}" @@ -28983,4 +29546,7 @@ #~ msgid "Layer {0} must be in list of layers" #~ msgstr "Слой{0} должен быть в списке слоев" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Открыть изображения через AgPifoJ..." #~ msgid "Remove relation member {0} {1}" @@ -29008,9 +29574,4 @@ #~ msgid "Delete all" #~ msgstr "Удалить всё" - -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Внимание: невозможно разместить диалоговое окно поверх всех окон. " -#~ "Исключение в: {0}" #~ msgid "Select a bookmark first." @@ -29095,4 +29656,9 @@ #~ " или вашем языке." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "" @@ -29140,4 +29706,18 @@ #~ msgid "Upload to OSM API failed" #~ msgstr "Ошибка загрузки в OSM API" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Включите, чтобы загрузить на сервер все изменения за один запрос или " +#~ "отключите, чтобы делать отдельный запрос для каждого изменённого элемента" + +#~ msgid "" +#~ "WARNING: no API version defined for data to upload. Falling back to " +#~ "version 0.6" +#~ msgstr "" +#~ "Предупреждение: нет версии API предназначенной для загрузки данных на " +#~ "сервер. Возврат к версии 0.6" #~ msgid "" @@ -29153,4 +29733,7 @@ #~ msgstr "Выделите начальную точку на конце линии" +#~ msgid "Download all incomplete ways and nodes in relation" +#~ msgstr "Скачать недостающие части линий и точки, участвующие в отношении" + #~ msgid "Only two nodes allowed" #~ msgstr "Можно только две точки" @@ -29163,4 +29746,8 @@ #~ msgid "{0} extrem nodes." #~ msgstr "{0} экстремальных точек." + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "Был запрос на загрузку модуля {0}. Этот модуль бульше не нужен." #~ msgid "" @@ -29267,4 +29854,13 @@ #~ msgstr "Показать статус квадрата карты" +#~ msgid "" +#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to " +#~ "use diff uploads, but API is not able to handle them. Ignoring diff " +#~ "upload." +#~ msgstr "" +#~ "ПРЕДУПРЕЖДЕНИЕ: параметр ''{0}'' или версия API ''{1}'' набора данных " +#~ "требует загрузку на сервер изменений, но API не способна выполнить это. " +#~ "Загрузка изменений на сервер будет проигнорирована." + #~ msgid "Replace the way this member refers to with the combined way" #~ msgstr "Заменить линию этим участником, связанным с объединённой линией" @@ -29294,4 +29890,11 @@ #~ msgid "Preset group ''{0}'' of group ''{1}''" #~ msgstr "Задать группу ''{0}'' в группе ''{1}''" + +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "" +#~ "Сгруппировать ввод простой интерполяции адресов в единственный диалог," + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Изображения с геотегами" #~ msgid "Relation: from {0} to {1} via {2}" @@ -29377,4 +29980,18 @@ #~ "и измените вручную Lambert zone в меню Кадастр" +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Модуль геотега для JOSM. Совмещает фотографии с GPS треками или " +#~ "импортирует геотеги из EXIF фотографий." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Несколько утилит, которые делают вашу жизнь проще: например, упростить " +#~ "линию; объединить полигоны; перейти в указанную точку." + #~ msgid "null detected in node list" #~ msgstr "обнаружено значение null в списке точек" Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 19198) +++ /applications/editors/josm/i18n/po/sk.po (revision 19199) @@ -4,10 +4,11 @@ # FIRST AUTHOR , 2008. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-12-02 16:29+0000\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-07 18:48+0000\n" "Last-Translator: Vlado \n" "Language-Team: Slovak \n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:29+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Vytváram hlavné grafické rozhranie ( GUI )" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Nápoveda" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorujem nesprávnu URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Upozornenie" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorujem poškodený súbor z URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Nemôžem čítať súbor ''{0}''.
Chyba je:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Nemôžem čítať súbor ''{0}''.
Chyba je:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "O programe JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -280,5 +282,5 @@ "je: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -289,5 +291,5 @@ "užívateľa pre OSM užívateľ je pravdepodobne chybný. API báza URL je: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -298,15 +300,20 @@ "obrazovku s oknom prehliadača
a spôsobiť ukončenie po nejakej dobe." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Pokračovanie" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -315,29 +322,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -354,5 +362,10 @@ msgstr "Zrušiť" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Neúspešné spustenie externého prehliadača pre pomoc" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Prosím vybrať aspoň jeden už nahraný bod, cestu, alebo reláciu." @@ -368,5 +381,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Zlúčiť" @@ -386,15 +399,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Pridať bod..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Pridať bod zadaním zemepisnej šírky a dĺžky." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -410,22 +423,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Úpravy: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Zadajte súradnice nového bodu." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Použite desatinné stupne." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Záporné hodnoty znamenajú západnú, resp. južnú pologuľu." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -434,5 +447,5 @@ msgstr "Zemepisná šírka" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -441,28 +454,29 @@ msgstr "Zemepisná dĺžka" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "Prosím vložte platnú zemepisnú šírku v rozsahu -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "Prosím vložte zemepisnú šírku v rozsahu -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "Prosím vložte platnú zemepisnú dĺžku v rozsahu -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "Prosím vložte zemepisnú dĺžku v rozsahu -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -474,9 +488,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "Zatvorte dialóg a vytvorte nový bod" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "Zatvorte dialóg, nevytvorte nový bod" @@ -497,18 +511,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -520,5 +534,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -540,6 +554,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -586,5 +600,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" @@ -621,14 +635,15 @@ msgstr "Nie je žiadny konflikt, čo by sa mohol priblížiť" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Zatvoriť otvorený súbor zmien" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Zatvárajú sa otvorené súbory zmien" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -638,21 +653,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Súbor: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Niesú tam otvorené súbory zmien" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Neotvorené súbory zmien" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Sťahujem otvorené súbory zmien" @@ -737,11 +752,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -819,16 +835,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -864,5 +885,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplikovať" @@ -905,10 +926,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Exportovať do GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Exportovať dáta do GPX súboru." @@ -923,12 +944,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -953,8 +974,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -965,10 +986,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -981,17 +1002,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1028,22 +1049,27 @@ msgstr "Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Spojiť prekrývajúce sa Plochy" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Spojiť plochy ktoré sa prekrývajú" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Prosím vyberte aspoň jednu uzavretú cestu ktorá by mala byť spojená." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Teraz môžu byť spojené iba dve plochy(areas)." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" niesú uzavreté a preto nemôžu byť spojené.." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1056,38 +1082,34 @@ "Ste si naozaj istý, že chcete pokračovať?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Prosím prerušiť ak ste si nie istý" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Prosím vyberte aspoň jednu uzavretú cestu ktorá by mala byť spojená." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Pridať body na všetky priesečníky" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Vymazať cesty, ktoré nie sú vnútornou časťou multipolygónu" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Oprava relácie" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Spojená prekrývajúca sa plocha" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Spojené prekrývajúce sa plochy" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1097,33 +1119,33 @@ "overte či to nepredstavuje nejakú chybu." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Zadajte hodnoty pre všetky konflikty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Riešenie konfliktov" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Oprava konfliktu (rozporu) značiek" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Odstránený Prvok z Relácií" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Spojiť plochy: Vymazať krátke cesty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Uzavretá cesta" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Vymazať značky z vnútorných ciest" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Funkcie Spojenia Plôch (Join Areas Function)" @@ -1287,5 +1309,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Nemôžem presúvať objekty mimo svet." @@ -1365,28 +1387,28 @@ msgstr "Sťahovanie dát" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Pravouhlý tvar" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Posunúť body tak, že všetky úhly sú 90 alebo 270 stupňov" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 msgid "Orthogonalize Shape / Undo" msgstr "Pravouhlý tvar / Obnovenie(Undo)" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 msgid "Undo orthogonalization for certain nodes" msgstr "Obnovenie(Undo) pravouhlosti pre určené body" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "Pravouhlosť / Obnovenie(Undo)" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1398,9 +1420,9 @@ "pravouhlosť!" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "Obnovenie(Undo) Pravouhlého tvaru" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1412,16 +1434,16 @@ "chcete odstrániť toto upozornenie.
Chcete pokračovať?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Pravouhlosť" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Využitie" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "Vybrané prvky nemôžu byť zpravouhlené" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Pravouhlosť" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1496,18 +1518,18 @@ msgstr "Nemôžem premenovať súbor ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Otočiť smer ciest" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Otočiť smer všetkých zvolených ciest." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Zvoľte minimálne jednu cestu." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Otočiť smer ciest" @@ -1516,10 +1538,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Uložiť" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Uložiť aktuálne dáta." @@ -1576,10 +1598,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Uložiť ako..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Uložiť aktuálne údaje do nového súboru." @@ -1624,6 +1646,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1656,5 +1677,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1725,5 +1746,5 @@ "cesty.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1734,5 +1755,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1742,5 +1763,5 @@ "toto overiť a opraviť ak je to nutné." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1774,34 +1795,34 @@ msgstr "Tento bod nie je prilepený k ničomu inému." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Žiaden z týchto bodov nie je prilepený k ničomu inému." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Žiadna z týchto ciest nie je prilepená k ničomu inému." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Tento výber sa nedá použiť pre oddelenie bodov" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Vyberte buď:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Jeden označený bod, alebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Jeden bod používaný viac než jednou cestou, alebo" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1810,5 +1831,5 @@ "ceste, alebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1817,5 +1838,5 @@ "ceste." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1828,9 +1849,9 @@ "svoje vlastné kópie a všetky bodybudú vybraté." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Nepripojený bod (Unglued Node)" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1838,5 +1859,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1871,10 +1892,10 @@ msgstr "Odznačiť všetko (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Aktualizácia dát" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "Aktualizácia objektov v aktívnej dátovej vrstve zo servera." @@ -1882,53 +1903,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "Sťahujem dáta" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Nájdená neaktuálna dátová sada" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "Nemôže byť nájdený objekt s id {0} v aktuálnej dátovej sade" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "Aktualizovať výber" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "Aktualizovať aktuálne vybraté objekty zo servera (znovu nahrať dáta)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Aktualizácia výberu" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "Pre aktualizáciu neboli vybrané žiadne objekty." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Výber je prázdny" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "Aktualizovať objekty" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Nahrať dáta" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "Nahrať všetky zmeny v aktívnej dátovej vrstve na OSM server" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1939,5 +1956,5 @@ "vyriešte." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1945,154 +1962,7 @@ msgstr "Žiadne zmeny pre uloženie." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "Synchronizovať iba {0} bod" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "Synchronizovať iba {0} cestu" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Synchronizovať iba {0} reláciu" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synchronizovať celú dátovú sadu" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"Aktualizácia neúspešná pretože server ná novú verziu " -"jednu z
vaších bodov, ciest, alebo relácií.
Konflikt je zapríčinený " -"{0} s id {1},
server má verziu {2}," -"vaša verzia je {3}.

Click {4} pre synchronizáciu iba " -"sporných pôvodných.
Click {5} pre synchronizáciu celej " -"lokálnej dátovej sady so serverom.
Click {6} pre " -"zrušenie a pokračovanie v editácii.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Objavené konflikty" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Nahrávanie neúspešné pretože server má novú verziu " -"jednu z
vašich bodov,ciest, alebo relácií.

Click {0}pre synchronizáciu celej lokálnej dátovej sady so serverom.
Click " -"{1} pre zrušenie a pokračovanie v editácii.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"Nahrávanie neúspešné pretože ste použili
zmenový " -"súbor {0} ktorý už bol zavretý v {1}.
Prosím nahrať znova s novým, alebo " -"existujúcim zmenovým súborom." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Zmenový súbor zavretý" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "Pripravujem rozhodnutie konfliktov" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "Kliknutím stiahnete všetky rodičovské cesty pre body {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "Kliknutím zrušíte a pokračujete v editovaní mapy" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" -"Nahrávanie neúspešné pretože sa snažíte zmazať bod " -"{0} ktorý je stále použitý v ceste {1}.

Klik {2} pre " -"stiahnutie všetky rodičovské cesty pre bod {0}.
Ak nevyhnutne JOSM bude " -"chcieť vytvoriť konflikty ktoré môžete rozhodnúť v the Conflict Resolution " -"Dialog." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "Bod je stále v užívaní" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" -"Varovanie: chybná hlavička \"{0}\" nenastala žiadna zhoda s očakávaným vzorom" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Aktualizácia pôvodných" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Náhrávanie dát na server z vrstvy ''{0}''" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Upozornenie: objekt ''{0}'' je už na servery zmazaný. Vynechávam tento " -"objekt a opakujem nahrávanie." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "objekt ''{0}'' je už zmazaný. Vynechávam objekt v nahrávaní." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "Nahrávam {0} objekty(ov) ..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" -"Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2227,9 +2097,9 @@ msgstr "Stiahnuté GPX dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Sťahujem dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2237,5 +2107,5 @@ msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "V tejto oblasti sa nenachádzajú žiadne dáta." @@ -2313,7 +2183,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2330,58 +2200,52 @@ "nemaže body. CTRL: zmaže referenčné objekty." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Kresliť" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Kresliť body" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Režim: Kresliť Fokus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "zvolené" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Nemôžem pridať body ležiace mimo svet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Pridať bod" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Pridať bod do cesty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Pripojiť existujúcu cestu do bodu" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Pridať nový bod do existujúcej cesty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Pridať bod do cesty a spojiť" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Vytvoriť nový bod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Zvoliť bod pod kurzorom." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2391,14 +2255,14 @@ msgstr[2] "Vložiť nový bod do {0} ciest." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Začiatok novej cesty z posledného bodu." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Pokračovanie cesty z posledného bodu." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Koniec kreslenia." @@ -2442,18 +2306,19 @@ "záznam prehrávať; SHIFT+uvoľnite synchronizovaný zvukový záznam v tom bode." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Výber" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Zvoliť, posunúť a otáčať objekty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2463,17 +2328,17 @@ msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Posunúť elementy" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Posunúť ich(them)" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Krok späť posun" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2485,13 +2350,13 @@ "Skutočne ich chcete presunúť?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Vždy posúvať a nezobrazovať znovu dialóg" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2499,9 +2364,9 @@ "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Pustite tlačítko myši k zastaveniu otáčania" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2513,5 +2378,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zväčšenie" @@ -2535,5 +2400,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Vyhľadávať objekty" @@ -2627,7 +2492,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - všetky objekty nahraté užívateľom" +msgstr "" +"užívateľ:anonymný - všetky objekty zmenené anonymnými užívateľmi" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2636,8 +2501,20 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - objekt s pridanými číslami bodov" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" +"značky:... - objekt s uvedeným číslom kvôli značkám (značky:spočítať " +"alebo značky:min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2647,26 +2524,32 @@ "alebo značky:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - všetky zmenené objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - všetky vybraté objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - všetky nekompletné objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - všetky neoznačené objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "dieťa výraz - všetky deti objektov vyhovujúcich výrazu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2674,19 +2557,19 @@ "rodič výraz - všetci rodičia objektov vyhovujúcich výrazu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Použite | alebo OR pri kombinácii s logickým \"alebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Použite \" ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Použite ( a ) k zoskupeniu výrazov" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2694,55 +2577,55 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Hľadať" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "Predložiť filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Začať vyhľadávanie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Neboli nájdené záznamy pre \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nič nebolo pridané do výberu hľadaním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nič nebolo odstránené z výberu hľadaním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nič sa nenašlo vo výbere vyhľadávania pre ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Najdených {0} zodpovedajúcich výrazov" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2755,5 +2638,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2761,10 +2644,10 @@ "použitia: kľúč=hodnota" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Syntaktická chyba vzoru: Vzor {0} v {1} je nedovolený!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2772,26 +2655,29 @@ "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Neočakávaná značka: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Chýbajúci argument pre \"alebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Chýbajúci argument pre \"NOT\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Očakávam uzatváraciu zátvorku." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Chýbajúci argument pre \"alebo\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "Zlý počet údajov(parametrov) pre operátor značiek." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2802,9 +2688,9 @@ "zo značiek alebo rozsahu, napríklad značky:1 alebo značky:2-5" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Zlé číslo parametrov pre operátor bodov." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2815,7 +2701,12 @@ "alebo rozsah bodov, napr. body:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Nesprávna hodnota pre id operátor: {0}. Číslo je očakávané." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Nesprávna hodnota pre id operátor: {0}. Číslo je očakávané." @@ -2849,43 +2740,33 @@ msgstr "Chyba počas komunikácie so serverom" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Aktuálne množstvo zmien prekročilo maximálne množstvo zmien, aktuálne je " -"{0}, maximálne je {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" +"Varovanie: automaticky skracujem hodnotu tagu ''{0}'' pri vymazaných " +"objektoch {1}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" +"Dĺžka s hodnotou pre tag ''{0}'' pri objekte {1} prekonala max. povolenú " +"dĺžku {2}. Dĺžka hodnoty je {3}." + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Predpoklad Porušenia" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "{0} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "API Capabilities Violation" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Varovanie: automatické skracovanie hodnôt a značiek ''{0}'' pri vymazávaní " -"pôvodných {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"Dĺžka hodnoty pre značku ''{0}'' pri pôvodnej {1} prekročila max. povolenú " -"dĺžku {2}. Dĺžka hodnôt je {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Predpoklad Porušenia" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "{0} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -3001,5 +2882,5 @@ msgstr "Nastavené {0}={1} pre {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -3016,5 +2897,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Dvojitý konflikt" @@ -3125,4 +3006,19 @@ msgstr "Vyriešte konflikty v zmazaných (state) v {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3238,5 +3134,5 @@ msgstr "Použiť?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3320,15 +3216,15 @@ msgstr "Parameter ''{0}'' > 0.0 očakávaný, dostal som {1}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, 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:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3339,5 +3235,5 @@ "nie je adresár." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3348,5 +3244,5 @@ "nie je adresár." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3357,5 +3253,5 @@ "chýbajúceho adresára preferencií: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3366,5 +3262,5 @@ "chýbajúceho adresára preferencií: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3374,5 +3270,5 @@ "súboru preferencií." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3383,5 +3279,5 @@ "súborom preferencií." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3392,5 +3288,5 @@ "preferencií do východzieho: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3401,5 +3297,5 @@ "súboru
{0}
a vytváranie nového východzieho súboru." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3410,10 +3306,10 @@ "preferencií do východzích: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, 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:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3423,24 +3319,24 @@ "záložiek ''{2}''" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Predvoľby uložené na {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Nemôžem nahrať predvoľby. Dôvod: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Nemôžem nahrať predvoľby zo servera." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "Chyba: Neočakávaný riadok ''{0}'' v obsahu záložiek zo servera" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3451,5 +3347,5 @@ "záložiek zo servera" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3482,5 +3378,5 @@ msgstr "Varovanie: opravný súbor ''/REVISION'' chýba." -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3502,31 +3398,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "J" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "S" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "Z" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Súbor zmien {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3534,5 +3423,5 @@ msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3546,26 +3435,26 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Chýbajúci cieľ pre spojenie s cestou s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Chýba zlúčujúci ciel pre bod s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Chýba zlúčujúci ciel pre objekt s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Chýba zlúčujúci ciel pre reláciu s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3574,5 +3463,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3587,5 +3476,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3593,25 +3482,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "H" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "Text" #. column header: apply filter for children -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "C" msgstr "C" #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "I" msgstr "I" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "M" @@ -3619,43 +3508,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "R" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "A" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "D" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "očekávané id >= 0. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "pôvodné s id=0 nemôžu byť neviditeľné" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "ID > 0 očakávané. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "verzia > 0 očakávaná. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Parameter ''{0}'' > 0 očakávaný, dostal som {1}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3665,5 +3566,5 @@ "je" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3693,10 +3594,6 @@ "viacnásobnými hodnotami" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "Vytvorený užívateľ s rovnakým uid, ale rozdielnym menom" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3704,7 +3601,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3719,5 +3616,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3735,146 +3632,138 @@ msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Cesta označená ako plocha nie je uzavretá." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Vymazaný člen ''{0}'' vo vzťahu (relation)." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Cesta ''{0}'' s menej, než dvoma bodmi." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Najdená viac než jedna \"from\" cesta." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Najdené viac cieľových \"to\" ciest." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Viac ako jedna \"via\" najdená." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Neznáma funkcia ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Neznámy typ člena pre ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Nenajdená cesta \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Nenajdená cesta \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Nie je \"via\" bod alebo cesta najdená." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Cesta \"from\" nezačína, ani nekončí v bode \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" bode." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Štýl pre obmedzenie {0} nenajdený." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Vnútorná(inner) cesta ''{0}'' je vonku." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "neoznačený" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "oblasť textu" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Chyba: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Varovanie: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "neaktívny" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "zvolené" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3884,6 +3773,6 @@ msgstr[2] "bodov" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3893,7 +3782,8 @@ msgstr[2] "ciest" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3903,21 +3793,37 @@ msgstr[2] "vzťahov (relations)" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "neoznačená cesta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "nekompletná cesta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "pozadie" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "označiť (highlight)" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "neoznačený" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "text" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "oblasť textu" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -4061,5 +3967,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "železnica" @@ -4075,7 +3981,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4093,4 +3999,10 @@ msgstr[2] "{0} členy" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Súbor zmien {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4122,6 +4034,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Konflikt" @@ -4135,7 +4047,7 @@ msgstr "Objekt je vymazaný" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4221,74 +4133,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Meno používateľa" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Heslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "použitie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "Možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Zobrazí túto nápovedu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Štandardný unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Stiahnuť ohraničujúcí box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Stiahnite polohu na url (s šírka=x&dĺžka=y&zväčšenie=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Otvoriť súbor (as raw gps, if .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Stiahnuť ohraničenú oblasť ako \"raw\" GPS dáta" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Výber s určeným hľadaním" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Spustiť v maximalizovanom režime" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Nastaviť východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Nastaviť jazyk." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "možnosti poskytnutia ako Java system properties" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/CESTA/K/JOSM/ZLOŽKE/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "Zmena adresára pre všetký nastavenia užívateľa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4300,9 +4212,9 @@ " Java nastavenie využitia na maximálnu mieru pridelenej pamäti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "príklady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4313,36 +4225,36 @@ "nejaké dáta predtým--výber" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Namiesto --download= môžete zadať osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktivujem aktualizované pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Načítavam skoršie pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Nastavujem východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Načítavam pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Súbor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4357,22 +4269,22 @@ msgstr "Upraviť" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Zobraziť" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Predvoľby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4380,5 +4292,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Zvuk" @@ -4459,13 +4371,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "Používateľ:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "vrstva nie je v zozname" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4498,5 +4411,5 @@ msgstr "Prebieha inicializácia" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4506,6 +4419,6 @@ "relácie." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4516,5 +4429,5 @@ "relácií." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4525,5 +4438,5 @@ "{1} relácií." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4533,25 +4446,25 @@ msgstr[2] "Vymazávam {0} objektov" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "Zmazať objekty" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "Na zmazanie" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "Z relácie" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "Pos." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4559,9 +4472,9 @@ msgstr "Úloha" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "Kliknutie zavrie dialóg a odstráni objekt z relácií" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "Kliknutie zavrie dialóg a zruší vymazanie objektov" @@ -4593,11 +4506,11 @@ msgstr "funkcia {0} sa nenachádza v porovnávenej dvojici {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4606,6 +4519,6 @@ msgstr "Značky" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4613,6 +4526,6 @@ msgstr "Body" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4620,23 +4533,23 @@ msgstr "Členovia" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Nevyriešený konflikt značiek musí byť vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Značky({0} konfliktov)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} nevyriešený konflikt značiek musí byť vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Body(vyriešené)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4645,17 +4558,17 @@ "tejto ceste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Body(v konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Nevyriešené konflikty v zozname bodov v tejto ceste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Členy(vyriešené)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4665,21 +4578,21 @@ "tejto relácii" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Členy(v konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "Nevyriešené konflikty v zozname členov v tejto relácii" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Nevyriešený konflikt vo vlastnostiech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Vlastnosti (s konfliktmi)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Nebyriešený konflikty vlastností musia byť vyriešené" @@ -4711,22 +4624,22 @@ msgstr "položka {0} sa v zozname nenachádza" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "zablokovať rolovanie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Porovnať " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Moja verzia" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Zoznam elementov v mojej dátovej sade, i.e. miestna dátová sada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4734,5 +4647,5 @@ msgstr "Spojovaná verzia" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4742,31 +4655,31 @@ "rozhodnutie pre spojenie bude aplikované" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Ich verzia" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Zoznam elementov v ich dátovej sade, i.e. v dátovej sade servera" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> hore" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Kopírovať moje vybrané body na začiatok zoznamu pre spojované body" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> dole" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" "Kopírovať moje vybrané elementy na koniec zoznamu pre spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4776,5 +4689,5 @@ "spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4784,5 +4697,5 @@ "spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4790,10 +4703,10 @@ "Kopírovať ich vybrané elementy na začiatok zoznamu pre spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" "Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4803,5 +4716,5 @@ "spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4811,23 +4724,23 @@ "spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Hore" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Posunúť hore vybrané elementy s rovnakou pozíciou" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Dole" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Posunúť dole vybrané elementy s rovnakou pozíciou" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4838,27 +4751,27 @@ msgstr "Odstrániť" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Blokovať" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Blokovať" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Blokovať aktuálny zoznam spojovaných elementov" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Odblokovať" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Odblokovať zoznam spojovaných elementov a začať spojovanie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4869,5 +4782,5 @@ "položiek" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4878,5 +4791,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4886,5 +4799,5 @@ msgstr[2] "Moja verzia ({0} vstupov)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4894,5 +4807,5 @@ msgstr[2] "Spojovaná verzia ({0} vstupov)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4902,5 +4815,5 @@ msgstr[2] "Ich verzia ({0} vstupov)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4912,5 +4825,5 @@ "nastavení synchronizácie." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5158,10 +5071,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5171,10 +5084,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5259,9 +5172,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Použiť" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5269,6 +5182,6 @@ msgstr "žiadny" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "všetky" @@ -5359,7 +5272,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5370,6 +5283,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5494,4 +5407,61 @@ msgstr "Zobraziť iba značky(tags) s konfliktami" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Zmazať zvolené objekty." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +#, fuzzy +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" +"Zvoliť pre stiahnutie dát na novú dátovú vrstvu.
Zrušiť voľbu pre " +"stiahnutie na aktuálne aktívnu dátovú vrstvu." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Zmenový súbor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "Priblížiť k tomuto bodu v aktuálnej vrstve" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +#, fuzzy +msgid "Select all objects assigned to the currently selected changesets" +msgstr "Zatvoriť práve vybratý otvorený zmenový súbor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Stiahnuť" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Stiahnutie mapových údajov z OSM servera." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Zavrieť vybrané otvorené zmenové súbory" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Zobraz info" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Otvoriť editor pre zvolenú reláciu" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5505,12 +5475,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5528,13 +5498,13 @@ msgstr "Príkazový Stĺpik: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "Vyriešiť konflikty." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Vyriešiť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5542,6 +5512,6 @@ "v obsahu na vrchu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5551,25 +5521,25 @@ "vrchu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Zrušiť rozhodnutie konfliktu a zavrieť dialóg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Použiť rozhodnutie konfliktu a zavrieť dialóg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Použiť rozhodnutie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "Zavrieť akúkoľvek cestu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "Pokračovanie rozhodnutia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5586,26 +5556,26 @@ "{1} to return to resolving conflicts." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "Konflikt nie je úplne vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Rozhodnutie konfliktov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Rozhodnúť konflikt pre ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "Filtrovať objekty a schovať/vypnúť ich." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5616,41 +5586,41 @@ msgstr "Pridať" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "Pridať filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "Upraviť filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "Zmazať filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "Posunúť filter hore." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "Posunúť filter dole." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "Zapnúť filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "Schovať prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "Uplatniť tiež pre deti(children)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "Obrátený filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "Režim filter" @@ -5689,5 +5659,5 @@ msgstr "Zobraziť históriu(priebeh) vybraných objektov." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "Dialóg ešte nie je vytvorený. Odvoláva sa na createInstance() first" @@ -5702,34 +5672,34 @@ msgstr "Otvoriť zoznam všetkých nahratých vrstiev." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Odstrániť vybranú vrstvu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Zobraziť/Skryť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Prepnúť viditeľnosť zvolenej vrstvy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Aktivovať" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Aktivovať vybratú vrstvu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Spojiť túto vrstvu do ďalšej vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Presunúť zvolenú vrstvu o riadok hore." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Presunúť zvolenú vrstvu o riadok dole." @@ -5739,5 +5709,182 @@ msgstr "Informácie o vrstve" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Otvoríť zoznam všetkých relácií" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relácie: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Otvoriť editor pre zvolenú reláciu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Zmazať vybraté relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Vytvoriť novú reláciu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +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" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "Pridať aktuálny výber do zoznamu vybratých relácií" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "Výber členov zo všetkých vybraných relácií" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "Výber členov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "Stiahnutie všetkých členov z vybraných relácií" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "Stiahnuť členov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Súčasný výber" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Otvoriť výber obsahu okien." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Priblížiť na vybraté elementy(s)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Priblížiť na výber" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Sel.: Rel.:{0} / Cesty:{1} / Body:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Výber" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Výber: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Uvoľniť panel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Zavrieť tento panel. Môžete ho znovu otvoriť tlačítkom na ľavej nástrojovej " +"lište." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Kliknite pre minimalizovanie/maximalizovanie obsahu panelu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Autori (spracovatelia)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Otvoríť zoznam ľudí, kterí pracujú na zvolenom objekte" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "Autori" +msgstr[1] "Autor" +msgstr[2] "Autorov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "Výber pôvodných, doplnených týmto používateľom" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "Uvedený prehliadač s informáciou o používateľovi" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" +"Varovanie: iba pre uvedené info prehliadača pre prvého {0} z {1} vybraných " +"používateľov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" +"Neúspešné vytvorenie URL pretože šifrovanie ''{0}'' bolo
chýbalo v " +"tomto systéme." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "Chýbajúce šifrovanie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Autor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Objekty" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "neúplný" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "uzavratá cesta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Sťahujem zmenové súbory..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5747,22 +5894,22 @@ msgstr[2] "Toto chce zmeniť {0} objektov." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "Prázdna hodnota vymaže tag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Zmeniť hodnoty ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5772,5 +5919,5 @@ msgstr[2] "Zmeniť vlastnosti až {0} objektov." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5780,233 +5927,71 @@ msgstr[2] "Toto zmení až {0} objekty." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Vyberte prosím kľúč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Vyberte prosím hodnotu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Vyberte prosím objekty, ktorým chcete zmeniť vlastnosti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Vlastnosti/Členstvo(memberships)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Vlastnosti pre zvolené objekty" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Pridať vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Vlastnosti: {0} / Memberships: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Vlastnosti / Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Zmeniť reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Zmazať z relácie (zo vzťahu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Naozaj zmazať výber z relacie {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Zmaže zvolený klúč vo všetkých objektoch" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Zmazať vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Otvoríť zoznam všetkých relácií" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relácie: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Otvoriť editor pre zvolenú reláciu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Zmazať vybraté relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Vytvoriť novú reláciu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -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" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "Pridať aktuálny výber do zoznamu vybratých relácií" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "Výber členov zo všetkých vybraných relácií" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "Výber členov" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "Stiahnutie všetkých členov z vybraných relácií" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "Stiahnuť členov" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Súčasný výber" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Otvoriť výber obsahu okien." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Priblížiť na vybraté elementy(s)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Priblížiť na výber" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Sel.: Rel.:{0} / Cesty:{1} / Body:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Výber" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Výber: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Uvoľniť panel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Zavrieť tento panel. Môžete ho znovu otvoriť tlačítkom na ľavej nástrojovej " -"lište." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Kliknite pre minimalizovanie/maximalizovanie obsahu panelu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Autori (spracovatelia)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Otvoríť zoznam ľudí, kterí pracujú na zvolenom objekte" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "Autori" -msgstr[1] "Autor" -msgstr[2] "Autorov" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "Výber pôvodných, doplnených týmto používateľom" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Zobraz info" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "Uvedený prehliadač s informáciou o používateľovi" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" -"Varovanie: iba pre uvedené info prehliadača pre prvého {0} z {1} vybraných " -"používateľov" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" -"Neúspešné vytvorenie URL pretože šifrovanie ''{0}'' bolo
chýbalo v " -"tomto systéme." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "Chýbajúce šifrovanie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Autor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Objekty" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -6069,20 +6054,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Sťahovanie relácie ''{0}''" -msgstr[1] "Sťahovanie relácie ''{0}''" -msgstr[2] "Sťahovanie relácie ''{0}''" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Stiahnuť členov relácie" +msgstr "Sťahovanie relácií" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Sťahovanie relácie ''{0}''" +msgstr "({0}/{1}: Sťahovanie relácie ''{2}''..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -6100,14 +6083,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Použiť Funkciu" +msgstr "Použiť Funkciu:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Vložiť funkcie pre všetkých členov relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "Vložiť funkciu a použiť na vybraté členy relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -6119,14 +6100,14 @@ "chcete pokračovať s kruhovou závislosťou?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "Odstraňte ich, vyčistite reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 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:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -6139,9 +6120,9 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 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:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -6153,5 +6134,5 @@ "odkazy a je preto znechutený.
Vynechanie relácie ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -6159,5 +6140,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:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -6165,5 +6146,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:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -6173,5 +6154,5 @@ "členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -6181,20 +6162,20 @@ "členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "Editor Relácií: Odstrániť Vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 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:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6204,69 +6185,69 @@ "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:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 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:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "Triedenie členov relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" msgstr "Triediť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "Editor Relácií: Triedenie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "Editor Relácií: Posun Hore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "Editor Relácií: Posun Dole" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 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:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "Editor Relácií: Odstrániť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "Vymazať práve vydanú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "Áno, vyriešiť konflikt a zavrieť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 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:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "Nie, pokračovať v editácii" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "Kliknutie navráti editor relácie a pokračuje v editovaní relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6278,9 +6259,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "Konflikt v dátach" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6291,49 +6272,47 @@ "rozhodnite najskôr tento konflikt, potom skúste znovu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "Použiť súčasnú aktuálizáciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 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:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 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:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Pridať prázdnu značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Stiahnuť členov relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "Stiahnuť všetký nekompletné členy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Stiahnuť členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "Editor Relácií: Sťahovanie Členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "Stiahnuť členov relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "Stiahnuť vybraté nekompletné členy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "Nastavenie funkcie pre vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Použiť Funkciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6346,34 +6325,34 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "Áno, Použiť to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "Nie, použite to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "Potvrdiť prázdnu funkciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 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/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "Zväčšiť na" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +msgstr "Priblížiť na objekt prvého vybratého člena odkazujúceho na" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "Zväčšovanie je vypnuté pretože vrstva z tejto relácie nie je aktívna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "Zväčšovanie je vypnuté pretože nie je vybratý člen" @@ -6491,10 +6470,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "Prosím zvoľte názov pre záložku zo sťahovanej oblasti" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "Názov miesta" @@ -6504,5 +6483,5 @@ msgstr "Vymazať vybraté záložky" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "Premenovať vybratú záložku" @@ -6590,9 +6569,4 @@ msgid "Download Area" msgstr "Stiahnuť plochu" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Stiahnuť" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6895,6 +6869,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6907,6 +6879,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -7177,4 +7147,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7397,5 +7371,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7438,116 +7412,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Názov" @@ -7571,15 +7545,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "Blízko" @@ -7759,11 +7733,11 @@ msgstr "Načítať históriu zo serveru" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" "priebeh nieje zatiaľ inicializovaný. Chyba odkazového súboru pôvodných." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7772,5 +7746,5 @@ "Neúspešné nastavenie odkazu. Odkaz ID {0} je nenájdený v histórii ID {1}." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7778,9 +7752,9 @@ msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "priebeh nie je inicializovaný. Chybný súbor aktuálnych pôvodných." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7895,6 +7869,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "neznámy" @@ -7919,13 +7893,13 @@ msgstr "anonymný" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Changeset info" msgstr "Info súboru zmien" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Launch browser with information about the changeset" msgstr "Uvedený prehliadač s informáciou o súbore zmien" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7960,4 +7934,136 @@ msgstr "Verzia" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Synchronizovať iba {0} bod" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Synchronizovať iba {0} cestu" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Synchronizovať iba {0} reláciu" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synchronizovať celú dátovú sadu" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"Aktualizácia neúspešná pretože server ná novú verziu " +"jednu z
vaších bodov, ciest, alebo relácií.
Konflikt je zapríčinený " +"{0} s id {1},
server má verziu {2}," +"vaša verzia je {3}.

Click {4} pre synchronizáciu iba " +"sporných pôvodných.
Click {5} pre synchronizáciu celej " +"lokálnej dátovej sady so serverom.
Click {6} pre " +"zrušenie a pokračovanie v editácii.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Objavené konflikty" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Nahrávanie neúspešné pretože server má novú verziu " +"jednu z
vašich bodov,ciest, alebo relácií.

Click {0}pre synchronizáciu celej lokálnej dátovej sady so serverom.
Click " +"{1} pre zrušenie a pokračovanie v editácii.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"Nahrávanie neúspešné pretože ste použili
zmenový " +"súbor {0} ktorý už bol zavretý v {1}.
Prosím nahrať znova s novým, alebo " +"existujúcim zmenovým súborom." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Zmenový súbor zavretý" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "Pripravujem rozhodnutie konfliktov" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "Kliknutím stiahnete všetky rodičovské cesty pre body {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "Kliknutím zrušíte a pokračujete v editovaní mapy" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" +"Nahrávanie neúspešné pretože sa snažíte zmazať bod " +"{0} ktorý je stále použitý v ceste {1}.

Klik {2} pre " +"stiahnutie všetky rodičovské cesty pre bod {0}.
Ak nevyhnutne JOSM bude " +"chcieť vytvoriť konflikty ktoré môžete rozhodnúť v the Conflict Resolution " +"Dialog." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "Bod je stále v užívaní" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" +"Varovanie: chybná hlavička \"{0}\" nenastala žiadna zhoda s očakávaným vzorom" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Doplniť krátky komentár k nahrávaným zmenám" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7976,39 +8082,151 @@ msgstr "Neotvárajte súbor zmien" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Otvoriť nový zmenový súbor" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Aktualizácia súboru zmien..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Nahrať dáta do už otvoreného zmenového súboru" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "zatvoriť zmenový súbor po nahratí" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "Vybrať na zavretie zmenový súbor po ďalšom nahratí" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "Nahrať obsah z vašich otvorených zmenových súborov zo servera" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "Zatvoriť práve vybratý otvorený zmenový súbor" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "Prosím vyberte zmenový súbor, ktorý chcete zavrieť" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "Otvoriť zmenové súbory" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Zatvoriť zmenové súbory" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "Zavrieť vybrané otvorené zmenové súbory" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "Zrušiť zatváranie zmenových súborov" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Zatváranie súboru zmien" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "zatváranie zmenového súboru {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +#, fuzzy +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" +"Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Uložiť meno a heslo (nešifrovane)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Zadajte uživateľské meno" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Prosím zapíšte značky o vašej stope(trace)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Upozornenie: Heslo sa posiela nešifrované." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Atletika" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Je dosiahnuté spojenie" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "Založiť (Launch) súbor podľa vyberajúcej osoby pre výber súboru" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "Vybrať meno súboru" @@ -8077,17 +8295,17 @@ msgstr "Uložiť vrstvu do ''{0}'' ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "Neuložené zmeny - Uložiť/Nahrať pred ukončením?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "Neuložené zmeny - Uložiť/Nahrať pred zmazaním?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "Nahrávam a ukladám zmenené vrstvy ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -8107,9 +8325,9 @@ "zrušte zmeny.
Vrstiev s konfliktami:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "Neuložené dáta a konflikty" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -8133,9 +8351,9 @@ "bez súborov:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "Neuložené dáta a stratený pričlenený súbor" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -8160,50 +8378,50 @@ "zrušte zmeny pre tieto vrstvy.
Vrstvy s nezapisovateľnými súbormi:" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "Neuložené dáta nezapisovateľných súborov" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "Zavrieť tento dialóg a pokračovať v editácii v JOSMe" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Zrušiť a Ukončiť" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "Ukončiť JOSM bez uloženia. Neuložené zmeny budú stratené." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "Zrušiť a Vymazať" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "Vymazať vrstvy bez uloženia. Neuložený zmeny budú staratené." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "Uložiť/Nahrať a Ukončiť" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "Ukončiť JOSM s uložením. Neuložené zmeny budú nahrané a/alebo uložené" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "Uložiť/Nahrať a Vymazať" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "Uložiť/Nahrať vrstvy pred vymazaním. Neuložené zmeny nebudú stratené." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "Pripravujem vrstvu ''{0}'' pre nahrávanie ..." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -8213,5 +8431,5 @@ "úpravami
bola zrušená alebo skončila neúspechom." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "Neúplné nahratie a/alebo uloženie" @@ -8284,40 +8502,400 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Nahrať" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Aktualizovať objekty" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Nastavenia" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "Rozhodnite sa ako nahrať dáta a ktoré zmenové dáta použiť" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "Značky pre nový súbor zmien" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "Použité značky pre dáta zmenovúho súboru sú nahraté do" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "pokročilý (advanced)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Nastavenie dostupných pluginov." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Náhrávanie dát na server z vrstvy ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Nahrať zmeny" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "Nahrať zmenené pôvodné" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "Neplatná poznámka nahrávania" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "Prosím najskôr vložte platnú veľkosť" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "Nedovolená veľkosť" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "Zrušiť nahrávanie a pokračovať v editácii" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Značky zo súboru zmien {0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" +"Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto " +"pôvodných a zopakovanie nahratia." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "Pripravujem pôvodné na nahratie ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, fuzzy, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +"Prosím potvrdiť odstránenie {0} objektov z " +"{1} relácií." +msgstr[1] "" +"Prosím potvrdiť odstránenie {0} objektov z " +"{1} relácií." +msgstr[2] "" +"Prosím potvrdiť odstránenie {0} objektov z " +"{1} relácií." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Náhrávanie dát na server z vrstvy ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "Pokračovať v nahrávaní" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +#, fuzzy +msgid "Click to return to the Upload Dialog" +msgstr "Kliknutím zavriete dialóg" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "O programe" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Kliknúť pre zrušenie spojovania bodov" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "Vyberte objekty na nahratie" +msgstr[1] "Vyberte objekty na nahratie" +msgstr[2] "Vyberte objekty na nahratie" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Info súboru zmien" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Upozornenie: objekt ''{0}'' je už na servery zmazaný. Vynechávam tento " +"objekt a opakujem nahrávanie." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "objekt ''{0}'' je už zmazaný. Vynechávam objekt v nahrávaní." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "Nahrávam {0} objekty(ov) ..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" +"Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" +"Oznečené zmenené objekty z aktuálneho výberu bude " +"nahratý na server." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" +"Označené lokálne zmazané objekty budú vymazané na " +"servery." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "Vyberte objekty na nahratie" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "Prerušiť nahrávanie" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" +"Varovanie: nečakaná hodnota kľúča ''{0}'' v preferenciách, dostal som ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Prosím vyberte riadok na odstránenie." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "Nahrať údaje v jednej požiadavke" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "Nahrať každý objekt individuálne" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "(1 požiadavka)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "(# požiadavky neznáme)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "({0} požiadavka)" +msgstr[1] "({0} požiadavky)" +msgstr[2] "({0} požiadaviek)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "Nepovolená veľkosť <= 0. Prosím vložte celé číslo > 1" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "Prosím vložte celé číslo > 1" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "Hodnota ''{0}'' nie je číslo. Prosím vložte celé číslo > 1" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Pridané objekty:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Upravené objekty:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Odstránené objekty:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8327,5 +8905,5 @@ msgstr[2] "{0} pridaných objektov:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8335,5 +8913,5 @@ msgstr[2] "{0} objektov na úpravy:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8343,217 +8921,37 @@ msgstr[2] "{0} zmazaných objektov:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Nahrať zmeny" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "Nahrať zmenené pôvodné" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "Neplatná poznámka nahrávania" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Prosím najskôr zadajte požadované koordináty." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "Zrušiť nahrávanie a pokračovať v editácii" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Doplniť krátky komentár k nahrávaným zmenám" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "Otvoriť nový zmenový súbor" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "Použiť a otvoriť zmenový súbor" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Nahrať dáta do už otvoreného zmenového súboru" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "zatvoriť zmenový súbor po nahratí" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "Vybrať na zavretie zmenový súbor po ďalšom nahratí" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Značky zo súboru zmien {0}" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "Nahrať obsah z vašich otvorených zmenových súborov zo servera" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "Zatvoriť práve vybratý otvorený zmenový súbor" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "Zmenový súbor id > 0 očekávaný. Got {0}" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto " -"pôvodných a zopakovanie nahratia." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "Pripravujem pôvodné na nahratie ..." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" -"Oznečené zmenené objekty z aktuálneho výberu bude " -"nahratý na server." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" -"Označené lokálne zmazané objekty budú vymazané na " -"servery." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "Vyberte objekty na nahratie" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "Prerušiť nahrávanie" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "Pokračovať v nahrávaní" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Nahrať všetky zmeny v jednej požiadavke" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "Chybná požiadavka" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} metrov" -msgstr[1] "{0} metrov" -msgstr[2] "{0} metrov" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Prosím vložte vybraný reťazec" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, fuzzy, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "Súbor ''{0}'' nie je zapisovateľný. Prosím zvoľte iné meno súboru." - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps poloha bodu" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Prispôsobiť kresliacu trasu" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Použíť globálne nastavenie." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Kresliť spojnice medzi bodmi v tejto vrstve" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Výber nastavenia kreslenej čiary" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8561,5 +8959,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8568,5 +8966,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8653,5 +9051,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Popis" @@ -8685,10 +9083,10 @@ msgstr[2] "{0} waypointov (bodov cesty)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Konvertovať do dátovej vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8698,12 +9096,12 @@ "chcete nahrať stopy (traces), pozrite sem:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8712,29 +9110,29 @@ msgstr "Prevedené z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Stiahnuť z OSM okolie tejto stopy (track)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Stiahnuť všetko vo vnútry:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} metrov" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Maximálna plocha na požiadavku:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} štvorcových km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8745,9 +9143,9 @@ "
Chcete pokračovať?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8757,5 +9155,5 @@ "alebo za koncom, boli vynechané, alebo presunuté na začiatok." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8765,23 +9163,23 @@ "ich času boli vynechané." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Údajová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "mimo ukladanej oblasti" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "verzia {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8791,5 +9189,5 @@ msgstr[2] "Bolo tam zistených {0} konfliktov." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8810,5 +9208,5 @@ "objektov
z miestnej dátovej sady, pretože bol zmazaný na servery." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8828,11 +9226,11 @@ "List Dialog a manuálne ich vyriešte." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "Kliknutím zavriete tento dialóga pokračujete v editovaní" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8842,36 +9240,36 @@ msgstr[2] "{0} vymazaných" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} se skladá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "neuršený (unset)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "Verzia API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Previesť do GPX vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "Test konzistencie dátovej sady" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "Nezistený žiadny problém" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "Bol najdený nasledujúci problém:" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8881,5 +9279,5 @@ "závadné.
Ak chcete nahrať stopy, pozrite sem:" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8889,5 +9287,5 @@ msgstr[2] "stopy" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8896,5 +9294,5 @@ msgstr[2] "bodov" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8904,5 +9302,5 @@ msgstr[2] "stopy s {0} bodmi" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8912,5 +9310,5 @@ msgstr[2] "{0} skladá sa z {1} stôp" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8920,24 +9318,24 @@ msgstr[2] "{0} bodov" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Súbory GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Súbor {0} je ešte nahratý pod menom \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Chyba pri rozkladaní {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Nemôžem čítať \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8949,34 +9347,34 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Čas fotografie (z exif):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "GPS čas (čítaj nad fotografiou) " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Som v časovej zóne: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Žiaden dátum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Otvoriť inú fotografiu" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synchronizovať čas z fotky a GPS prímača" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8986,70 +9384,158 @@ "Prosím použite požadovaný formát." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Neplatný dátum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX stopa(trasa): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Otvoriť inú GPX stopu(trasu)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Auto-Guess" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Aktualizovať pozíciu pre: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Časové pásmo: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Vyrovnať(Offset):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Môžem použiť obrázok z môjho GPS prímača.
Môže toto pomôcť?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Aktualizovať pozíciu pre: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Všetky obrázky" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Obrázky bez exif pozície" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Zatiaľ neoznačkované obrázky" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Nič nie je vybraté!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Zladené {0} z {1} fotiek k GPX stope." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Zladiť obrázky s GPX stopou(track)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Zladiť" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-Guess" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Neplatné časové pásmo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Neplatné vyrovnanie (offset)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Trasovanie" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Časové pásmo: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Minút: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekúnd: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Časový rozdiel z {0} dní)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" +"Chyba nastala zatiaľ čo sa snažím dať fotky do GPX trasy. Musíte nastaviť " +"posúvač ručne na fotky." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "Priraďovanie fotiek ku stope(track) zlyhalo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Nastaviť časové pásmo a vyváženie(offset)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "Vybraté fotografie neobsahujú informácie o čase." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Fotografie neobsahujú informácie o čase." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX Stopa nemá informáciu o čase." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "Môžete vybrať GPX stopu(track)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "Nevybratá GPX stopa(track)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -9060,9 +9546,5 @@ "Čakám na formát: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Neplatné časové pásmo" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -9073,136 +9555,56 @@ "Čakám na formát: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Neplatné vyrovnanie (offset)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Najdené {0} zhody z {1} v GPX stope {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Nahratá GPX stopa(trasa)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Vybraté fotografie neobsahujú informácie o čase." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Fotografie neobsahujú informácie o čase." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX Stopa nemá informáciu o čase." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Časové pásmo: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minút: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekúnd: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Zladené {0} z {1} fotiek k GPX stope." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Časový rozdiel z {0} dní)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" -"Chyba nastala zatiaľ čo sa snažím dať fotky do GPX trasy. Musíte nastaviť " -"posúvač ručne na fotky." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Priraďovanie fotiek ku stope(track) zlyhalo" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Nastaviť časové pásmo a vyváženie(offset)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Východzie hodnoty" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Získavam GPS polohu z EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Začínam prehľadávať adresár" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "Niektorý z vybratých súborov bol prázdny" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Čítať fotky..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Čítam {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Nemôžem získať cestu pre adresár {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Prehľadávam adresár {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Nájdený prázdny súbor v adresári {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Chyba pri získavaní súború z adresára {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Obrázky s GPS súradnicami" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Zladiť GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -9211,52 +9613,100 @@ msgstr[2] "obrázkov" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} boli nájdené s gps značkami." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Vždy posúvať a nezobrazovať znovu dialóg" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Súbor nie je možné nájsť." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Bez obrázka" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Nahrávam {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Chyba v súbore {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Zobraziť fotky s geoznačkami" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Predchádzajúci" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Predchádzajúci obrázok" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Internetová stránka: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Odstraniť fotku z vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Zmazať z relácie (zo vzťahu" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Nasledujúci" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Nasledujúci obrázok" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Stredový pohľad" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Najvhodnejšie zväčšenie 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -9267,5 +9717,5 @@ "Výška: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9374,4 +9824,12 @@ msgstr "Chyba zobrazovania URL" +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" @@ -9596,7 +10054,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Všetko" @@ -9665,6 +10122,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Bicykel" @@ -10064,31 +10521,94 @@ msgstr "Projekcia {0} nemohla byť aktivovaná. Bude použitá projecia Mercator" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Používať proxy server" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonymný" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Ubytovňa" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Port:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Heslo" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Nastavenia proxy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Adresa proxy servera" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Port proxy servera" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Užívatelské meno pre proxy" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Heslo pre proxy" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "Základná URL pre OSM server (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "Prihlasovacie meno (e-mail) pre OSM konto." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo ukladať." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Základná Serverová URL" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "OSM užívateľské meno (e-mail)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM heslo" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení." +"
Heslo je prenesené v jednoduchom texte na server, kódované v URL." +"
Nepoužite vzácne Heslo." #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10393,5 +10913,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10402,13 +10922,13 @@ msgstr[2] "Odstrániť staré kľúče z {0} objektov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "Pridať novú značku" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "Zmazať výber v tabuľke značiek" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10416,18 +10936,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Voliteľné atribúty:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "uzavratá cesta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Neznány type (druh): {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10438,16 +10958,16 @@ msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Chyba rozkladania(parsovania) {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementy typu(druhu) {0} sú podporované." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10457,18 +10977,18 @@ msgstr[2] "Zmeniť {0} objektov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Nič nie je vybraté!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Nevhodný výber!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Použiť predvolené" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Zmeniť vlastnosti" @@ -10497,4 +11017,13 @@ msgstr "Sťahujem body {0} až {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +#, fuzzy +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" +"Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10512,12 +11041,71 @@ "Dostal som ''{0}''" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, pravdepodobne chýbajú niektoré značky (tagy)." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Pripravujem dáta..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, fuzzy, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" +"neočakávaný formát novej verzie zo zmenených pôvodných ''{0}'', dostáva " +"''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, fuzzy, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" +"Varovanie: nečakaná hodnota kľúča ''{0}'' v preferenciách, dostal som ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +#, fuzzy +msgid "Parsing response from server..." +msgstr "Pýtam sa na meno servera ..." + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "neočakávané číslo stĺpca {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10620,10 +11208,10 @@ msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "Neznámy mód {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -10632,6 +11220,6 @@ "pôvodných" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10641,20 +11229,20 @@ msgstr "Sťahujem OSM údaje..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Priniesť(Fetching) bod s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Priniesť(Fetching) cestu s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Priniesť(Fetching) reláciu s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -10662,20 +11250,20 @@ "Server odpovedal stretol sa s reakcoiu kódu 404 pre id {0}. Vynechanie." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Priniesť(Fetching) balíček bodov z {0}" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Priniesť(Fetching) balíček ciest z {0}" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Priniesť(Fetching) balíček relácií z {0}" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10685,11 +11273,11 @@ "pre každý pôvodný" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Sťahovanie relácie ''{0}''" -msgstr[1] "Sťahovanie relácie ''{0}''" -msgstr[2] "Sťahovanie relácie ''{0}''" +msgstr[0] "Sťahovanie {0} objektu z ''{1}''" +msgstr[1] "Sťahovanie {0} objektov z ''{1}''" +msgstr[2] "Sťahovanie {0} objektov z ''{1}''" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10726,10 +11314,10 @@ msgstr "NMEA import zlyhal!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, fuzzy, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." msgstr "preferencie ''{0}'' chýbajú. Nemôžem inicializovať OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" @@ -10737,25 +11325,24 @@ "nastaveniach." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"Podporuje protokol verzií 0.5 a 0.6, zatiaľ čo server hlási podporu {0} to " -"{1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +"Podporuje protokol verzie 0.6, zatiaľ čo server uvádza podporu {0} do {1}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Komunikácia s {0} je ustálená, používa protokol verzie {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10765,66 +11352,77 @@ "''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "Vytváranie súboru zmien..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "Úspešne otvorený súbor zmien {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "Zmenový súbor id > 0 očekávaný. Got {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Aktualizácia súboru zmien..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "Aktualizácia súboru zmien {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Zatváranie súboru zmien..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Nenachádza sa tu súbor zmien pre diff nahratie" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Pripravujem..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Nahrávam..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Začínam nahrávať požiadavku ..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Nahrávam {0} objekty(ov) ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "Čakanie 10 sekúnd ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Začiatok opakovania {0} z {1} v {2} sekunde ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "OK - skúšam znovu." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "Spúšťam opakovanie {0} z {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "Aktuálny zmenový súbor ja prázdny. Nemôžem nahrať dáta." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "ID z aktuálneho zmenového súboru > 0 požadovaný. Aktuálne ID je {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10851,4 +11449,14 @@ msgid "Invalid bz2 file." msgstr "Poškodený bz2 súbor." + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10859,5 +11467,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10884,5 +11492,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10890,5 +11498,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10901,5 +11509,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10910,61 +11518,6 @@ msgstr "rozkladám obsah zo zmenového súboru..." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Nesprávne heslo alebo meno." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Upozornenie: Heslo sa posiela nešifrované." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Uložiť meno a heslo (nešifrovane)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Zadajte heslo" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Prihlásenie" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "Základná URL pre OSM server (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "Prihlasovacie meno (e-mail) pre OSM konto." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo ukladať." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Základná Serverová URL" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "OSM užívateľské meno (e-mail)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM heslo" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení." -"
Heslo je prenesené v jednoduchom texte na server, kódované v URL." -"
Nepoužite vzácne Heslo." - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -11065,5 +11618,12 @@ msgstr "Súbor \"{0}\" neexistuje" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -11074,30 +11634,30 @@ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" "vytvoriť XML element element nie je ako priame dieťa z elementu " -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Chýba povinná vlastnosť ''{0}'' na z cesty {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "Neplatná hodnota vlastnosti ''ref'' z elementu . Got {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" "Vytvoriť XML element <člen> nie je ako priame dieťa z elementu " -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "Chýba vlastnosť ''ref'' pre člena v relácii {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" @@ -11105,10 +11665,10 @@ "Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -11117,19 +11677,19 @@ "Neplatná hodnota vre vlastnosť ''type'' pre člena {0} v relácii {1}. Got {2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Nekompletné špecifikácie s ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Vynechávam." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Neplatný objekt s id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -11140,8 +11700,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -11153,25 +11713,42 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Neznáma, alebo nepodporovaná API verzia. Got {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "Chýba vlastnosť ''verzia'' na OSM pôvodných s id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" +"Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "Neplatná hodnota pre vlastnosť ''uid''. Got ''{0}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "Chýba povinná vlastnosť ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -11180,5 +11757,5 @@ "Cesta s externou ID ''{0}'' obsahuje chýbajúci bod s externou ID ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -11189,5 +11766,5 @@ "chýbajúci v nahratých dátach a je preto neúplná tiež." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -11195,5 +11772,5 @@ msgstr "Neznámy typ relačného člena ''{0}'' v relácii s eterným id ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -11204,13 +11781,13 @@ "''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Pripravujem OSM údaje..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "Rozložiť OSM dáta..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "Pripravujem dátový súbor ..." @@ -11233,20 +11810,33 @@ msgstr "Sťahovanie odkazovaných relácií ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "Načitávam zmenové súbory..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "Sťahujem zmenové súbory..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "Načitávam zmenový súbor {0} ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." +msgstr "Sťahujem zmenový súbor {0} ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Sťahujem zmenové súbory..." +msgstr[1] "Sťahujem zmenové súbory..." +msgstr[2] "Sťahujem zmenové súbory..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." msgstr "Sťahujem zmenový súbor {0} ..." @@ -11266,7 +11856,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "neočakávaná hodnota parametra\"index\". Got {0}" +msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -11275,9 +11865,5 @@ msgstr "Neúspešné nadviazanie spojenia do API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "Chyba: neúspešné pridanie poverovacej autentifikácie pre spojenie." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11331,21 +11917,25 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "neočakávaná hodnota parametra\"index\". Got {0}" +msgstr "Hodnota >0 očakávaná pre parameter ''{0}'', dostal som {1}" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 -#, fuzzy msgid "Starting to upload in chunks..." -msgstr "Začínam nahrávať požiadavku ..." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format msgid "({0}/{1}) Uploading {2} objects..." -msgstr "Nahrávam {0} objekty(ov) ..." +msgstr "({0}/{1}) Nahrávanie {2} objektov..." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Nahrávam dáta ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Vymazané alebo presunuté pôvodné" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11388,12 +11978,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Zmazať {1} {0}" +msgstr "Zmazať staršie pluginy {0}" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Chyba pri mazaní súboru pluginu: {0}" +msgstr "Zmazať staršie súbory pluginov {0}" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11422,5 +12012,5 @@ #, java-format msgid "Plugin {0} is no longer necessary and has been deactivated." -msgstr "" +msgstr "Plugin {0} nie je viac potrebný a má byť deaktivovaný." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84 @@ -11541,9 +12131,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "Popis nedostupný" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Viac detailov" @@ -11687,4 +12277,19 @@ msgstr "Stretli ste sa s chybou v JOSMe" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, fuzzy, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Parameter ''{0}'' > 0 očakávaný, dostal som {1}" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -12037,6 +12642,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Nahrať Stopy (Traces)" @@ -12122,5 +12727,5 @@ msgstr "Nahrávam GPX stopu (track)" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Nahrať Stopy (Traces) na openstreetmap.org" @@ -12131,5 +12736,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Interpolácia adries" @@ -12145,11 +12750,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Nepárny (odd)" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Vyrovnať (even)" @@ -12160,24 +12762,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Číslo" +msgstr "Číselný" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "prírodné (natural)" +msgstr "Aktuálny" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "miesto (blízke okolie)" +msgstr "Odhad" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Požičovňa" +msgstr "Potenciál" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -12195,7 +12793,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "vnútorná časť (inner segment)" +msgstr "Prírastok:" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -12209,9 +12806,9 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226 msgid "Accuracy:" -msgstr "" +msgstr "Presnosť:" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238 msgid "Convert way to individual house numbers." -msgstr "" +msgstr "Zmeniť cestu na samostatné čísla domov." #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307 @@ -12261,7 +12858,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 -#, fuzzy msgid "Expected valid number for address increment" -msgstr "Očakávané nepárne čísla pre adresy" +msgstr "Očakávané platné číslo prírastka čísla adresy" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 @@ -12312,5 +12908,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "Vybrať Feuille" @@ -12376,21 +12972,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Vybrať hranice obce(samosprávy)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Vybrať z..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Automatické získavanie" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12402,13 +12998,13 @@ "Budete si želať obnoviť F11 pre grabovanie?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "Obnoviť klávesovú skratku pre grabovanie F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM ja zastavený aby zmeny mohli byť prevedené" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12435,18 +13031,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" "Vypnuté orezávanie obrázkov pri určovaní zemepisnej polohy (georeferencingu)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Povoliť automatické cachovanie." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Maximálna veľkost cache (v MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12463,18 +13059,18 @@ "
predtým, ako nahráte nejaké dáta vytvorené týmto pluginom." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "French cadastre WMS (Francúzsky kataster WMS)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Zdroj" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12484,5 +13080,5 @@ "JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12492,53 +13088,50 @@ "pre texty na tmavých pozadiach." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Povoliť vyrovnanie viacnásobných vrstiev" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Nastaviť priehľadnosť WMS vrstiev" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Kresliť obdĺžnik okolo sťahovaných dát z WMS servera." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "Zachytávač vektorových obrázkov multiplikátor:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Zachytávanie menších obrázkov ( vyššia kvalita, ale použije viac pamäte)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Pevná veľkosť štvorcov (východzia 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Pevná veľkosť v rozmedzí (od 25 do 1000 metrov)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "Zachytávač rastrových obrázkov multiplikátor:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Staré súbory sú automaticky zmazané, keď táto veľkosť je prekročená" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Dodatočný zdroj automatických-značiek:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Pridať \"source=...\" do položiek?" @@ -12760,5 +13353,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Umiestnenie" @@ -12961,5 +13554,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Neboli načítané žiadne dáta." @@ -12981,9 +13574,9 @@ msgstr "Konvertovať do GPX vrstvy s neznámym časom" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "upraviť gpx stopy(tracks)" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "UpraviťGpx" @@ -13372,7 +13965,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "voda" @@ -13533,19 +14126,19 @@ msgstr "Nemôžem získať obrázok" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Pripájam sa" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Pripojené" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Nepripojený" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Spojenie zlyhalo" @@ -13584,32 +14177,32 @@ msgstr "LiveGPS layer" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Nahrať GPS Stopu" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "Pripojiť to gpsd server a ukázať aktuálnu polohu v LiveGPS vrstve." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Vycentrovať (Center Once)" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Stred LiveGPS vrstvy v aktuálnej polohe." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Automatický stred (Auto-Center)" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Nepretržite stred LiveGPS vrstvy do aktuálnej polohy" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13660,9 +14253,9 @@ msgstr "Nedá sa kresliť mimo svet." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "Režim merania" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Meranie" @@ -13701,5 +14294,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13710,13 +14303,13 @@ msgstr "Vytvoriť multipolygón." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "Jedna z vybraných ciest už je súčasťou iného multipolygónu." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "Multipolygón sa musí skladať iba z uzavretých ciest." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "Musíte vybrať aspoň dve cesty." @@ -13868,5 +14461,5 @@ msgstr "Spúšťací súbor Firefoxu" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "PicLayer" @@ -13961,5 +14554,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -14035,41 +14628,41 @@ msgstr "Vstup hmotnostnej hodnoty" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "Auto Zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Nahrať Dlaždice (Tiles)" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "Ukázať Info Dlaždíc" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Nahrať Všetky Dlaždice" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Priblíženie" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Oddialiť" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "Snímka na veľkosť dlaždice" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "Flush Tile Cache" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "obrázok " @@ -14243,4 +14836,43 @@ msgstr "Najskôr určite zdroj predvoľby značenia v predvoľbách." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Vyrovnať (even)" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Najnižšie číslo" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Navyššie číslo" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Hlavné komunikácie" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Navyššie číslo" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -14259,42 +14891,20 @@ msgstr "Otočiť smer radu budov" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Vytvoriť rad budov" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Vytvoriť viac jednotlivých budov z jednej dlhej budovy." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Vyberte jedinú, uzavretú cestu s najmenej štyrmi bodmi." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Rad (Terrace)" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Navyššie číslo" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Najnižšie číslo" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolácia (vloženie)" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Názov ulice" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Voliteľné" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14309,5 +14919,5 @@ msgstr "Žiadne chyby na overenie" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Mriežka" @@ -14975,38 +15585,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "budova" @@ -15020,5 +15600,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "oblasť (plocha)" @@ -15136,10 +15716,10 @@ msgstr "Nemôžem čítať informácie z walking-papers.org the id \"{0}\"" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Walking Papers: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15902,6 +16482,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Ref. číslo" @@ -16347,5 +16927,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Šírka (v metroch)" @@ -16463,5 +17043,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "kov" @@ -16473,5 +17053,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "drevo (wood)" @@ -16729,4 +17309,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16758,8 +17341,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "áno" @@ -16907,9 +17492,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "nie" @@ -17154,5 +17740,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "obytná (osídlená)" @@ -17187,5 +17773,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "obslužná (service)" @@ -17219,6 +17805,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "konštrukcia" @@ -17268,5 +17854,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "kruhový objazd (roundabout)" @@ -17454,6 +18040,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Turistika" @@ -17574,5 +18160,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17598,4 +18183,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17605,15 +18191,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operátor" @@ -17826,7 +18412,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Nadmorská výška" @@ -18251,5 +18837,5 @@ msgstr "slatina" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -18259,5 +18845,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "močiar (marsh)" @@ -18784,32 +19370,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Otváracia doba" @@ -18868,91 +19454,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "24/7" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "Po-Pi 08:30-20:00" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Ut-Ne 08:00-15:00; So 08:00-12:00" @@ -18967,5 +19553,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18984,7 +19570,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Referenčné číslo" @@ -19000,5 +19586,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "podzemie" @@ -19011,6 +19597,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Poplatok" @@ -19049,22 +19635,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Obchod" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Upraviť obchod s autami" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Servis" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Upraviť autoservis" @@ -19072,5 +19646,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Požičovňa" @@ -19079,10 +19653,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Upraviť autopožičovňu" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)" @@ -19090,5 +19664,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)" @@ -19096,10 +19670,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Upraviť parkovisko bicyklov" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Kapacita" @@ -19108,22 +19682,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Upraviť požičovňu bicyklov" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Upraviť bicyklový obchod" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Hromadná doprava" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -19133,5 +19700,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -19139,5 +19706,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Reference" @@ -19145,5 +19712,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Železničná zastávka" @@ -19151,5 +19718,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Upraviť zastávku" @@ -19157,5 +19724,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Zastávka električky" @@ -19164,5 +19731,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Upraviť zastávku električky" @@ -19170,5 +19737,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Železničné nástupište" @@ -19177,5 +19744,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Upraviť železničné nástupište" @@ -19187,5 +19754,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Referencie (číslo stopy(track))" @@ -19193,10 +19760,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Oblasť" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Vchod do metra" @@ -19205,10 +19772,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Upraviť vchod do metra" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Invalidný vozík" @@ -19217,5 +19784,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Autobusová stanica" @@ -19224,5 +19791,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Upraviť autobusovú stanicu" @@ -19230,5 +19797,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Autobusová zastávka" @@ -19238,5 +19805,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Upraviť autobusovú zastávku" @@ -19245,17 +19812,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Prístrešok" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Lavička" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Autobusové nástupište" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Upraviť autobusové nástupište" @@ -19263,5 +19838,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -19269,5 +19844,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Upraviť stanicu taxíkov" @@ -19275,5 +19850,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Letisko" @@ -19281,15 +19856,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Upraviť letisko" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -19297,10 +19872,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Cestovanie" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Ubytovanie" @@ -19312,5 +19887,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -19319,15 +19894,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Upraviť hotel" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Hviezdičkový" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motel" @@ -19335,20 +19910,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Upraviť motel" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Penzión" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Upraviť penzión" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Chata" @@ -19356,10 +19931,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Upraviť chatu" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Ubytovňa" @@ -19367,30 +19942,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Upraviť ubytovňu" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Horská chata" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Upraviť horskú chatu" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Kemping pre obytné prívesy" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Upraviť kemping pre obytné prívesy" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Stanový tábor" @@ -19398,10 +19973,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Upraviť stanový tábor" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Jedlo + Pitie" @@ -19412,5 +19987,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Reštaurácia" @@ -19418,5 +19993,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Upraviť reštauráciu" @@ -19424,5 +19999,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Kuchyňa" @@ -19430,61 +20005,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "talianska" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "čínska" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "grécka" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "nemecká" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indická" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "regionálna" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turecká" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "ázijská" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thajská" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexická" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japonská" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Rýchle občerstvenie" @@ -19492,9 +20067,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Upraviť reštauráciu rýchleho občerstvenia" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Kaviareň" @@ -19502,9 +20077,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Upraviť kaviareň" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Krčma" @@ -19512,18 +20087,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Upraviť krčmu" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Záhradná reštaurácia" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Upraviť záhradnú reštauráciu" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Bar (výčap)" @@ -19531,9 +20106,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Upraviť bar (výčap)" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Nočný klub" @@ -19541,24 +20116,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Upraviť nočný klub" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turistika" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Atrakcia" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Upraviť atrakciu" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Múzeum" @@ -19566,9 +20141,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Upraviť múzeum" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -19577,9 +20152,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Upraviť zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Výhliadka" @@ -19587,24 +20162,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Upraviť výhliadku" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Výhliadková veža" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Zábavný park" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Edit Theme Park" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Umelecké dielo" @@ -19612,5 +20187,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Upraviť umelecké dielo" @@ -19618,19 +20193,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Informačná kancelária" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Mapa" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "Úroveň detailu" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "topografická" @@ -19668,5 +20243,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19674,28 +20249,28 @@ msgstr "pouličná sieť" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "prehľadová (oreintačná)" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "Zobrazená oblasť" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "miesto (blízke okolie)" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "mesto (city)" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "oblasť (region)" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Bližší popis" @@ -19705,5 +20280,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "Zobrazené cesty sú pre:" @@ -19711,6 +20286,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Cyklistika" @@ -19718,5 +20293,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "Horský bicykel" @@ -19724,6 +20299,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Lyžovanie" @@ -19731,5 +20306,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "Jazdectvo" @@ -19737,46 +20312,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "... iný druh prepravy" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Informačná tabuľa" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "Informačný panel s radami (board content)" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "upozornenie" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "história" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "príroda" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "divoká príroda" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "závod" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "Rázcestník (ukazovateľ smeru)" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "Informačný terminál" @@ -19784,29 +20359,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "Bližší popis" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1769 msgid "Audioguide" msgstr "Audiosprievodcovia" #. -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" msgstr "Audiosprievodcovia cez mobilný telefón?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 +#: build/trans_presets.java:1780 msgid "Phone number" msgstr "Číslo telefónu" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Ostatné (iné) informačné body (miesta)" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Upraviť prístrešok" @@ -19814,25 +20389,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Ohnisko" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Výletné miesto" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Upraviť výletné miesto" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Historické miesta" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Hrad" @@ -19841,19 +20416,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Upraviť hrad" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Zrúcanina" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Upraviť zrúcaninu" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Archeologické nálezisko" @@ -19862,9 +20437,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Upraviť archeologické nálezisko" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Bojisko" @@ -19872,10 +20447,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Upraviť bojisko" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "Palaeontological Areál" @@ -19883,5 +20458,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "Upraviť Palaeontological Areál" @@ -19889,15 +20464,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Pamätihodnosť, pamätník" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Upraviť pamätihodnosť, pamätník" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Pomník" @@ -19905,55 +20480,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Upraviť pomník" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Kríž pri ceste" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Upraviť kríž pri ceste" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Božia muka" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Upraviť božiu muku" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "Hraničné kamene" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "Upraviť hraničné kamene" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Voľný čas" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Vodný zábavný park" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Upraviť vodný zábavný park" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Ihrisko" @@ -19961,35 +20536,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Upraviť ihrisko" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Rybolov" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Upraviť rybolov" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Športy" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Športové zariadenie" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Štadión" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Upraviť štadión" @@ -20003,6 +20578,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "vyberte šport:" @@ -20394,30 +20969,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "šport" @@ -20427,68 +21002,68 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "multi" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "lukostreľba" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "atletika" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "australian_football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basketbal" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "kanoe" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "lezenie" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "kriket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" @@ -20496,160 +21071,160 @@ "trávnika)" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "bicyklovanie" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "závody chrtov" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "jazdectvo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "americký futbal" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gymnastika" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hokej" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "konské dostihy" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "automobilový" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "racquetbal (podobné ako squash, iné pravidlá)" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "ragby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "streľba" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "korčuľovanie" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "lyžovanie" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "futbal (soccer)" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "plávanie" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "stolný tenis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tenis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Športové centrum" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Upraviť športové centrum" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Hracia plocha, ihrisko" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Upraviť hraciu plochu, ihrisko" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Dostihová dráha" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Upraviť dostihovú dráhu" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfové ihrisko" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Upraviť golfové ihrisko" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Upraviť minigolf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Šport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Multi" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Upraviť Multi" @@ -20688,21 +21263,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "typ" @@ -20741,203 +21316,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "hracia plocha, ihrisko" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "športové centrum" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "štadión" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "stopa" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "10pin (Kolok na hru s desiatimi kolkami)" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Atletika" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Upraviť atletiku" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Lukostreľba" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Upraviť lukostreľbu" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Lezenie" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Upraviť lezenie" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Kanoistika" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Upraviť kanoistiku" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Upraviť cyklistiku" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Preteky chrtov" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Upraviť preteky chrtov" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Jazdectvo" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Upraviť jazdectvo" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Konské dostihy" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Upraviť konské dostihy" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gymnastika" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Upraviť turistiku" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Motošport" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Upraviť motošport" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Korčuľovanie" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Upraviť korčuľovanie" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Upraviť Skateboard" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Plávanie" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Upraviť plávanie" @@ -20945,56 +21520,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Upraviť lyžovanie" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Typ lyžiarskej dráhy" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "zjazdárska" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "beh nalyžiach hore kopcom (nordic)" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "park zimných športov" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Obtiažnosť" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "pre začiatočníkov" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "ľahká" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "stredne pokročilý (intermediate)" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "pokročilý (advanced)" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "pre skúsených" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "freeride (zjazd na horských bicykloch cez prekážky)" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Streľba" @@ -21002,182 +21577,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Upraviť streľbu" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Šport (loptový)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Futbal" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Upraviť futbal" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Americký futbal" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Upraviť americký futbal" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Australian Football" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Upraviť Australian Football" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Bejzbal" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Upraviť bejzbal" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basketbal" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Upraviť basketbal" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Upraviť golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golfové ihrisko" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Bowling na tráve" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Upraviť bowling na tráve" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Bowling" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Upraviť bowling" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Kriket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Upraviť kriket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Cvičné ihrisko pre kriket so sieťou" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Upraviť cvičné ihrisko pre kriket so sieťou" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Upraviť kroquet" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hokej" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Upraviť hokej" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Upraviť polotu" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Racquetbal" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Upraviť racquetbal" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Ragby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Upraviť ragby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Stolný tenis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Upraviť stolný tenis" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Upraviť tenis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "Človekom-Vytvorené (Man-Made)" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Budovy, stavby" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Budova" @@ -21185,5 +21760,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Verejná budova" @@ -21191,10 +21766,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Upraviť verejnú budovu" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Radnica (obecný úrad)" @@ -21202,10 +21777,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Upraviť radnicu (obecný úrad)" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Veľvyslanectvo" @@ -21213,10 +21788,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Upraviť veľvyslanectvo" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Súd" @@ -21225,10 +21800,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Upraviť súd" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Vezenie" @@ -21237,10 +21812,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Upraviť súd" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Polícia" @@ -21250,10 +21825,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Upraviť políciu" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Hasičská stanica" @@ -21262,10 +21837,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Upraviť hasičskú stanicu" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Pošta" @@ -21273,5 +21848,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Upraviť poštu" @@ -21279,15 +21854,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Škôlka" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Upraviť škôlku" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Škola" @@ -21295,10 +21870,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Upraviť školu" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Univerzita" @@ -21306,10 +21881,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Upraviť Univerzitu" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Vysoká škola" @@ -21317,5 +21892,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Upraviť vysokú školu" @@ -21323,5 +21898,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Kino" @@ -21330,10 +21905,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Upraviť kino" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Knižnica" @@ -21342,9 +21917,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Upraviť knižnicu" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Kultúrne stredisko" @@ -21352,10 +21927,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Upraviť kultúrne stredisko" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Divadlo" @@ -21364,10 +21939,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Upraviť divadlo" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Kostol" @@ -21377,5 +21952,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Upraviť kostol" @@ -21384,6 +21959,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Náboženstvo" @@ -21392,66 +21967,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "baháisti" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "budhisti" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "kresťania" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hinduisti" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "džinisti" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "judaisti" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "moslimovia" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spiritualisti" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoisti" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "unitársky" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrian" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Vyznanie (cirkevné)" @@ -21460,81 +22035,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglikánska" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptistická" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "katolícka" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evanjelikánska" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "svedkovia jehovovi" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "lutheránska" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "methodistická" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormónska" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "orthodoxná" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbiteriánska" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestanská" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "quakerská" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "šiítska" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunnitská" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adresy" @@ -21543,5 +22118,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Upraviť informácie o adrese" @@ -21549,5 +22124,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Číslo domu" @@ -21555,20 +22130,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Meno domu" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Názov ulice" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Názov mesta" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Poštové smerovacie číslo" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Kód krajiny" @@ -21577,5 +22157,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Upraviť interpoláciu adries" @@ -21583,61 +22163,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Schéma číslovania" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "nepárne" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "párne" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "abecedný" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Človekom vytvorené (Man made)" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Závody (továrne)" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Upraviť závody (továrne)" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Veža" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Upraviť vežu" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "Typ veže" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "telekomunikačná" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "pozorovateľňa" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "Výška (metre)" @@ -21645,25 +22225,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Vodojem" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Upraviť vodojem" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Plynojem (Gasometer)" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Upraviť plynojem (gasometer)" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Maják" @@ -21671,10 +22251,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Upraviť maják" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Veterný mlyn" @@ -21682,10 +22262,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Upraviť veterný mlyn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Potrubie" @@ -21694,37 +22274,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Upraviť potrubie" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "ropa(oil)" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "plynová" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "splašky(sewage)" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "teplo(heat)" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "nejaké látky(any substance)" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "podvodné(underwater)" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "nadzemné(overground)" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Čistička odpadových vôd" @@ -21734,10 +22314,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Upraviť čističku odpadových vôd" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Žeriav" @@ -21745,10 +22325,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Upraviť žeriav" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Signál (rádiomaják)" @@ -21756,10 +22336,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Upraviť signál (rádiomaják)" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Meračský bod" @@ -21767,10 +22347,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Upraviť meračský bod" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Pozorovanie (ostraha)" @@ -21778,5 +22358,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Upraviť pozorovaciu kameru" @@ -21784,5 +22364,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Elektráreň (spôsob vyroby)" @@ -21792,35 +22372,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Upraviť elektráreň (spôsob vyroby)" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "veterná" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "vodná" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fosílna" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "jadrová" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "uhoľná" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "fotovoltanická (slnečná články)" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Transformátorová stanica" @@ -21829,10 +22409,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Upraviť trafostanicu" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Malý transformátor" @@ -21841,5 +22421,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Upraviť malý transformátor" @@ -21847,10 +22427,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Odkazová linka" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Elektrický stožiar (vysoké napätie)" @@ -21861,23 +22441,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Upraviť elektrický stožiar" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "veža" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "stožiar(pole)" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "Nastavenie veže" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Elektrické vedenie" @@ -21886,75 +22466,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Upraviť elektrické vedenie" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "Typ vedenia" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "vedenie" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "vedľajšie_vedenie" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Napätie" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "Počet káblov" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "Počet vodičov (lepší: vodič) pre napájacie káble" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "jedno" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "dvojité" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "trojité" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "štvorité" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Vybavenosť (Amenities)" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Toalety" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Poznámka" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Poštová schránka" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefón" @@ -21963,5 +22543,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Upraviť telefón" @@ -21969,5 +22549,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Mince" @@ -21975,5 +22555,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Bankovky" @@ -21981,5 +22561,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Platobné karty a Kreditné karty" @@ -21987,5 +22567,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Debetné karty" @@ -21993,15 +22573,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kreditné karty" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefónne karty" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Recyklácia" @@ -22010,5 +22590,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Upraviť recykláciu (zber)" @@ -22016,68 +22596,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batérie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Plechovky" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Handry" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Sklo" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Železný šrot" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Lavička" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "Oreradlo chrbta (Backrest)" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "Materiál" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "kameň" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "plast" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "Farba" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "čierna" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "hnedá" @@ -22148,39 +22723,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "zelená" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "červená" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "modrá" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "šedá" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "biela" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "Počet sedadiel" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Poľovnícky posed" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Upraviť poľovnícky posed" @@ -22189,30 +22764,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Výška" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "nízky" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "polovičný" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "úplný" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Skryť" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Zamknúť" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fontána" @@ -22221,10 +22796,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Upraviť fontánu" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Pitná voda" @@ -22233,10 +22808,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Upraviť pitnú vodu" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Hniezdo záchrany" @@ -22244,33 +22819,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Upraviť hniezdo záchrany" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Obchody" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Upraviť obchod s autami" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Upraviť bicyklový obchod" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Upraviť supermarket" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "Lekáreň" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "Upraviť lekáreň" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Obchod s polotovarmi" @@ -22278,9 +22877,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Upraviť obchod s polotovarmi" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Stánok" @@ -22288,27 +22887,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Upraviť stánok" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "Kníhkupectvo" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "Upraviť kníhkupectvo" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Cestovná kancelária" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Upraviť cestovnú kanceláciu" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Predajný automat" @@ -22316,5 +22915,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Upraviť predajný automat" @@ -22322,88 +22921,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Predávané výrobky" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "lístky MHD" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "plány MHD" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "parkovacie lístky" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "jedlo" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "pitie" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "sladkosti" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "cigarety" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "fotky" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "krmivo pre zvieratá" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "noviny" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "hračky" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "známky" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-karty" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "telefónne kupóny (poukážky)" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "kupóny (poukážky)" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "kondómy" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampóny" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "sáčky na výkaly" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Prístupové alebo vernostné karty" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Mäsiareň" @@ -22411,9 +23010,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Upraviť mäsiarstvo" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Chlieb a pečivo" @@ -22421,9 +23020,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Upraviť chlieb a pečivo" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Kvetinárstvo" @@ -22431,18 +23030,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Upraviť kvetinárstvo" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Biopotraviny" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Upraviť biopotraviny" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Alkohol" @@ -22450,54 +23049,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Upraviť Obchod s alkoholickými nápojmi" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Nápoje" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Upraviť Obchod s nápojmi." -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Počítač" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Upraviť počítačový obchod" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Elektronika" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Upraviť obchod s elektronikou" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Upraviť obchod s Hifi elektronikou" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Nábytok" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Upraviť obchod s nábytkom" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Záhradné centrum" @@ -22505,9 +23104,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Upraviť záhradné centrum" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Železiarstvo" @@ -22515,9 +23114,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Upraviť železiarstvo" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Obchod Urob si sám" @@ -22525,54 +23124,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Upraviť obchod Urob si sám" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Papierníctvo" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Upraviť papierníctvo" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Kaderníctvo" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Upraviť kaderníctvo" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Obuva" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Upravit obchod s obuvou" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Hračky" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Upraviť obchod s hračkami" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Obchod s DVD" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Upraviť obchod s DVD" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Chemická čistiareň" @@ -22580,9 +23179,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Upraviť chemickú čistiareň" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Práčovňa" @@ -22590,9 +23189,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Upraviť práčovňu" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Turistický (Outdoor)" @@ -22600,28 +23199,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Upraviť športový obchod" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Optik" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Upraviť očnú optiku" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Hotovosť" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banka" @@ -22629,14 +23228,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Upraviť banku" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Zmenáreň" @@ -22644,5 +23243,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Upraviť zmenáreň" @@ -22650,15 +23249,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Upraviť bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Zdravie" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Lekári" @@ -22666,18 +23265,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Upraviť lekárov" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Zubný lekár" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Upraviť zubného lekára" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Lekáreň" @@ -22685,5 +23284,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Upraviť lekáreň" @@ -22691,9 +23290,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "výdaj na recepty" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Nemocnica" @@ -22701,10 +23300,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Upraviť nemocnicu" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Pohotovosť (Záchranná služba)" @@ -22713,5 +23312,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Upraviť pohotovosť (záchrannú službu)" @@ -22720,20 +23319,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Číslo bodu" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Meno bodu(miesta)" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Telefónne číslo" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Použite medzinárodný kód, ako +12-345-67890)" @@ -22741,5 +23340,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Veterinár" @@ -22748,64 +23347,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Upraviť veterinárnu ambulanciu" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "Geografia(Zemepis)" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Miesta" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Upraviť kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Krajina (štát)" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Upraviť krajinu (štát)" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Stav" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Upraviť štát" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Oblasť (región)" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Upraviť oblasť (región)" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "kraj (okres)" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Upraviť kraj (okres)" @@ -22813,15 +23412,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Mesto (city)" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Upraviť mesto" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Mesto (town)" @@ -22829,10 +23428,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Upraviť mesto" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Štvrť" @@ -22840,25 +23439,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Upraviť štvrť" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Dedina" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Upraviť dedinu" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Malá dedina / osada / samota" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Upraviť malú dedinu" @@ -22866,5 +23465,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Oblasť (lokalita)" @@ -22872,10 +23471,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Upraviť oblasť (lokalitu)" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Ostrov" @@ -22883,10 +23482,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Upraviť Ostrov" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "Ostrovček" @@ -22894,5 +23493,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "Upraviť ostrovček" @@ -22900,5 +23499,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Vstup do jaskyne" @@ -22906,10 +23505,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Upraviť vstup do jaskyne" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Vrchol" @@ -22917,10 +23516,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Upraviť vrchol kopca" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Ľadovec" @@ -22928,10 +23527,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Upraviť ľadovec" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Sopka" @@ -22939,70 +23538,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Upraviť sopku" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Hranice" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Štátna" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Upraviť štátne hranice" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administratívne" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Upraviť administratívne hranice" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Občianske" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Upraviť občiansku hranicu" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Politická" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Upraviť politickú hranicu" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Národný park" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Využívanie oblasti (Land use)" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Strom" @@ -23011,15 +23610,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Upraviť strom" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botanický názov" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Drevo" @@ -23028,5 +23627,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Upraviť Drevo" @@ -23034,17 +23633,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "ihličnatý" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "listnatý" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "zmiešaný" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Les" @@ -23053,14 +23652,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Upraviť les" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Prírodná rezervácia" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Upraviť prírodnú rezerváciu" @@ -23068,25 +23667,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Sutina" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Upraviť sutinu" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Krovie" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Upraviť krovie" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))" @@ -23094,5 +23693,5 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "" @@ -23100,5 +23699,5 @@ #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Vresovisko" @@ -23106,5 +23705,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Upraviť vresovisko" @@ -23112,5 +23711,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Farma" @@ -23119,45 +23718,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Upraviť farmu" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Poľnohospodárska pôda" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Upraviť poľnohospodárske pôdu" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Lúka" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Upraviť lúku" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vinica" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Upraviť vinicu" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Ťažobný priestor" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Upraviť ťažobný priestor" @@ -23165,25 +23764,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Záhrada" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Upraviť záhradu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Tráva" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Upraviť trávnatú plochu" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Obecná zeleň" @@ -23191,10 +23790,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Upraviť obecnú zeleň" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Spoločné, obecné" @@ -23202,20 +23801,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Upraviť spoločné, obecné" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Upraviť park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Rekreačná oblasť" @@ -23223,5 +23822,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Upraviť rekreačnú oblasť" @@ -23229,15 +23828,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Osídlená oblasť (Residential area)" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Upraviť osídlenú oblasť" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Cintorín (malý, blizko kostola)" @@ -23245,9 +23844,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Upraviť cintorín (malý, blizko kostola)" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Cintorín" @@ -23255,39 +23854,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Upraviť cintorín" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Maloobchod" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Upraviť oblasť s maloobchodmi" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Obchodná (komerčná)" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Upraviť obchodnú (komerčnú) oblasť" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Priemysel" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Upraviť priemyselnú oblasť" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Železničný pozemok" @@ -23295,15 +23894,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Upraviť železničný pozemok" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Armáda" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Upraviť vojenskú oblasť" @@ -23311,55 +23910,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Stavebná oblasť" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Upraviť stavebnú oblasť" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Brownfield (opustený priemyselný objekt)" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Upraviť brownfield (opustený priemyselný objekt)" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Skládka odpadov" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Upraviť skládku odpadov" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Lom" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Upraviť lom" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "multipolygón" @@ -23369,5 +23968,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Upraviť multipolygón" @@ -23376,10 +23975,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "obvodová časť (outer segment)" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "vnútorná časť (inner segment)" @@ -23387,5 +23986,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Prikázané smery jazdy (turn restriction)" @@ -23394,5 +23993,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Upraviť prikázané smery jazdy (turn restriction)" @@ -23400,34 +23999,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Obmedzenie" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "zákaz zabočenia vľavo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "zákaz zabočenia vpravo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "zákaz jazdy priamo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "zákaz otáčania sa" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "prikázané odbočenie vpravo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "prikázané odbočenie vľavo" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "zákaz odbočenia" @@ -23436,15 +24035,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "z cesty" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "cez bod alebo cestu" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "k ceste" @@ -23452,5 +24051,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Cesta (Route)" @@ -23459,5 +24058,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Upraviť Cestu (Route)" @@ -23465,5 +24064,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Typ Cesty (Route)" @@ -23535,24 +24134,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "bicykel" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "cesta (vozovka)" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "trajekt (prievoz)" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "lyžovanie" @@ -23605,5 +24204,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23612,13 +24211,13 @@ msgstr "pešia (foot)" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "turistika" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "električka" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "obchádzka" @@ -23632,10 +24231,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "metro (subway)" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Popis značky" @@ -23643,31 +24242,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Sieť" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "Štátna cesta" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "plánovaný" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "náhradný" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "dočasný" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "spojenie" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Farba (hex)" @@ -23676,30 +24275,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "cestný úsek" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "predný segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "zadný segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "bod prerušenia" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "predný bod prerušenia" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "zadný bod prerušenia" @@ -23910,130 +24509,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -24050,98 +24523,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "zastaralý" @@ -24518,7 +24900,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "cesta (highway_track)" @@ -24582,13 +24964,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "koľajnica (rail)" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24604,5 +25065,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "služby" @@ -24616,5 +25077,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "brod" @@ -24635,5 +25096,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)" @@ -24648,5 +25109,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "miesto pohotovostnej prvej pomoci" @@ -24661,5 +25122,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "riečny breh" @@ -24673,5 +25134,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "potok" @@ -24685,5 +25146,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "dok (nakladacia rampa)" @@ -24705,16 +25166,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "akvadukt" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24811,4 +25260,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24877,13 +25333,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "človekom vytvorené (manmade)" @@ -24929,6 +25385,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24945,7 +25401,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "železničná výhybka" @@ -24968,10 +25424,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "iná koľaj" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "nadchod nad železnicou" @@ -25007,11 +25463,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "historická železnica(turistická)" #. color rail +#. #. 1 #. 50000 @@ -25052,6 +25509,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "letecké cesty" @@ -25065,5 +25522,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminál" @@ -25085,5 +25542,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "zjazdovka_čierna" @@ -25097,5 +25554,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "zjazdovka_ľahká" @@ -25103,4 +25560,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -25150,7 +25614,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "Visuté cesty/Lanovky" @@ -25167,5 +25631,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "mierna zjazdovka (piste_easy)" @@ -25180,5 +25644,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "stredne ťažká zjazdovka (piste_intermediate)" @@ -25193,5 +25657,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "zjazdovka pre pokročilých (piste_advanced)" @@ -25206,5 +25670,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "zjazdovka pre expertov (piste_expert)" @@ -25219,5 +25683,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "zjazdovka pre freeride (piste_freeride)" @@ -25232,5 +25696,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "zjazdovka pre začiatočníkov (piste_novice)" @@ -25350,11 +25814,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "energia (power)" @@ -25368,5 +25832,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "hrádza (pier)" @@ -25380,5 +25844,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "potrubie (pipeline)" @@ -25506,12 +25970,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "oddych (leisure)" @@ -25525,5 +26006,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "prístav (marina)" @@ -25561,4 +26042,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25577,4 +26074,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25595,8 +26100,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "zaujímavosti (amenity)" @@ -25698,10 +26205,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "verejná_doprava" @@ -25955,5 +26462,5 @@ #. #. -#. +#. #. color health #. @@ -26099,4 +26606,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -26116,23 +26631,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "svetelné zariadenie" @@ -26164,6 +26679,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "osvetlená_voda (light_water)" @@ -26224,14 +26739,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "zdravie" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26578,5 +27093,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26599,5 +27113,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "obchod" @@ -26669,8 +27184,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotel" @@ -26771,9 +27286,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "cestovanie" @@ -26861,9 +27376,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "historické" @@ -26877,5 +27392,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "lom" @@ -26889,5 +27404,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "skládka odpadov (landfill)" @@ -26909,5 +27424,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody" @@ -26921,5 +27436,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "les" @@ -26933,5 +27448,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "farmy" @@ -26954,5 +27469,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "maloobchody" @@ -26966,5 +27481,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "závody" @@ -26978,5 +27493,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "brownfield (opustený priemyselný objekt)" @@ -26990,5 +27505,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)" @@ -27002,5 +27517,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "železničný pozemok" @@ -27057,7 +27572,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "armáda" @@ -27071,5 +27586,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "cintorín (cemetery)" @@ -27082,5 +27597,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "vrchol (peak)" @@ -27095,5 +27610,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "ľadovec (glacier)" @@ -27107,5 +27622,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "sopka" @@ -27160,8 +27675,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "prírodné (natural)" @@ -27175,5 +27690,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "oblasť pokrytá krovím" @@ -27187,5 +27702,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "vresovisko" @@ -27199,5 +27714,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "zalesnená oblasť (woodarea)" @@ -27211,5 +27726,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "blato (mud)" @@ -27223,5 +27738,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "pláž (beach)" @@ -27299,8 +27814,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "trasa (route)" @@ -27348,7 +27863,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "hranica (boundary)" @@ -27498,11 +28013,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "miesto" @@ -27550,6 +28065,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adresa" @@ -27905,132 +28420,121 @@ msgstr "Sicily - Italy" +#~ msgid "Updating primitive" +#~ msgstr "Aktualizácia pôvodných" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Očakávam uzatváraciu zátvorku." + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná." - -#~ msgid "Download all incomplete ways and nodes in relation" -#~ msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii" +#~ "Aktuálne množstvo zmien prekročilo maximálne množstvo zmien, aktuálne je " +#~ "{0}, maximálne je {1}" + +#~ msgid "User with the same uid but different name found" +#~ msgstr "Vytvorený užívateľ s rovnakým uid, ale rozdielnym menom" + +#~ msgid "Use an open changeset" +#~ msgstr "Použiť a otvoriť zmenový súbor" #~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie " -#~ "jednej požiadavky na zmenené pôvodné" - -#~ msgid "Images for {0}" -#~ msgstr "Obrázky pre {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Čítať GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Žiadny čas pre bod {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Nenájdené žiadne obrázky s časovými značkami." - -#~ msgid "GPS start: {0}" -#~ msgstr "Štart GPS: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "Koniec GPS: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "súčastná odchylka: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "rozdiel časových pásiem: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} vo vnútry stopy (track)." - -#~ msgid "Sync clock" -#~ msgstr "Synchronizovať hodiny" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Dáta v súbore \"{0}\" nemohli byť parsované." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "V súbore \"{0}\" nie je časová značka EXIF" +#~ "Môžem použiť obrázok z môjho GPS prímača.
Môže toto pomôcť?" + +#~ msgid "All images" +#~ msgstr "Všetky obrázky" + +#~ msgid "Images with no exif position" +#~ msgstr "Obrázky bez exif pozície" + +#~ msgid "Not yet tagged images" +#~ msgstr "Zatiaľ neoznačkované obrázky" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Najdené {0} zhody z {1} v GPX stope {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "Nahratá GPX stopa(trasa)" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s" + +#~ msgid "Default Values" +#~ msgstr "Východzie hodnoty" + +#~ msgid "Enable proxy server" +#~ msgstr "Používať proxy server" + +#~ msgid "Anonymous" +#~ msgstr "Anonymný" + +#~ msgid "Proxy server host" +#~ msgstr "Adresa proxy servera" + +#~ msgid "Proxy server port" +#~ msgstr "Port proxy servera" + +#~ msgid "Proxy server username" +#~ msgstr "Užívatelské meno pre proxy" + +#~ msgid "Proxy server password" +#~ msgstr "Heslo pre proxy" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, pravdepodobne chýbajú niektoré značky (tagy)." + +#~ msgid "Preparing data..." +#~ msgstr "Pripravujem dáta..." + +#~ msgid "Preparing..." +#~ msgstr "Pripravujem..." + +#~ msgid "Uploading..." +#~ msgstr "Nahrávam..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Nesprávne heslo alebo meno." + +#~ msgid "Enter Password" +#~ msgstr "Zadajte heslo" + +#~ msgid "Login" +#~ msgstr "Prihlásenie" + +#~ msgid "Error: failed to add authentication credentials to the connection." +#~ msgstr "Chyba: neúspešné pridanie poverovacej autentifikácie pre spojenie." + +#~ msgid "Auto-tag source added:" +#~ msgstr "Dodatočný zdroj automatických-značiek:" + +#~ msgid "Interpolation" +#~ msgstr "Interpolácia (vloženie)" + +#~ msgid "Optional" +#~ msgstr "Voliteľné" + +#~ msgid "Shop" +#~ msgstr "Obchod" + +#~ msgid "aqueduct" +#~ msgstr "akvadukt" + +#~ msgid "Move" +#~ msgstr "Presunúť" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený." + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Vyriešiť konflikty" #~ msgid "Image" #~ msgstr "Obrázok" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Synchronizovať čas s GPS zariadením" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Zadaný čas nemôže byť rozparsovaný" - -#~ msgid "" -#~ "WARNING: no API version defined for data to upload. Falling back to " -#~ "version 0.6" -#~ msgstr "" -#~ "VAROVANIE: žiadna API verzia vymedzená pre dáta na nahratie. Ustúpiť do " -#~ "verzie 0.6" - -#~ msgid "" -#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to " -#~ "use diff uploads, but API is not able to handle them. Ignoring diff " -#~ "upload." -#~ msgstr "" -#~ "Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady " -#~ "požadujú použiť rozdielne nahratie , ale API nie je schopného ovládať." -#~ "Ignorujem rozdielne nahrávanie." - -#~ msgid "" -#~ "Loading of {0} plugin was requested. This plugin is no longer required." -#~ msgstr "" -#~ "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej " -#~ "potrebný." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - obrázky s geoznačkami" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Otvoriť obrázky s AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "možnosti pre osmarender" - -#~ msgid "Group common Address Interpolation inputs in a single dialog," -#~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu." - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "Ďalší geotag(GPS poloha) plugin pre JOSM. Zľaďované obrázky s GPS " -#~ "stopami, alebo import EXIF geotagged(GPS poloha) obrázkov." - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Niekoľko pomôcok(utilities) ktoré vám uľahčia život(prácu): napr. " -#~ "zjednodušenie cesty, spojiť plochy, skok na pozíciu." - -#~ msgid "Move" -#~ msgstr "Presunúť" - -#~ msgid "No document open so nothing to save." -#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený." - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Vyriešiť konflikty" #~ msgid "my version:" @@ -28115,4 +28619,7 @@ #~ msgstr "Vznikli konflikty počas importu" +#~ msgid "Download all incomplete ways and nodes in relation" +#~ msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii" + #~ msgid "Date" #~ msgstr "Dátum" @@ -28178,4 +28685,43 @@ #~ msgstr "meno" +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}" + +#~ msgid "GPS start: {0}" +#~ msgstr "Štart GPS: {0}" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Žiadny čas pre bod {0} x {1}" + +#~ msgid "Images for {0}" +#~ msgstr "Obrázky pre {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Čítať GPX..." + +#~ msgid "current delta: {0}s" +#~ msgstr "súčastná odchylka: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "rozdiel časových pásiem: " + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)" + +#~ msgid "{0} within the track." +#~ msgstr "{0} vo vnútry stopy (track)." + +#~ msgid "Sync clock" +#~ msgstr "Synchronizovať hodiny" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Dáta v súbore \"{0}\" nemohli byť parsované." + +#~ msgid "GPS end: {0}" +#~ msgstr "Koniec GPS: {0}" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Zadaný čas nemôže byť rozparsovaný" + #~ msgid "Login name (email) to the OSM account." #~ msgstr "Prihlasovacie meno (email) k OSM účtu." @@ -28211,4 +28757,7 @@ #~ msgstr "finálna verzia:" +#~ msgid "osmarender options" +#~ msgstr "možnosti pre osmarender" + #~ msgid "Import TCX file as GPS track" #~ msgstr "Importovať TCX súbor ako GPS trasu" @@ -28258,4 +28807,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Naozaj označiť tento problém ako \"hotový\"?" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Otvoriť obrázky s AgPifoJ..." #~ msgid "Please enter a search string" @@ -28354,4 +28906,13 @@ #~ msgid "Split way segment" #~ msgstr "Rozdeliť segment cesty" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchronizovať čas s GPS zariadením" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Nenájdené žiadne obrázky s časovými značkami." #~ msgid "Add either site-josm.xml or Wiki Pages." @@ -28426,4 +28987,7 @@ #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" #~ msgstr "Nastaviť ručne Lambert zone (e.g. for locations between two zones)" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - obrázky s geoznačkami" #~ msgid "Selected makes your trace public in openstreetmap.org" @@ -28494,4 +29058,7 @@ #~ "stiahnuť." +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "V súbore \"{0}\" nie je časová značka EXIF" + #~ msgid "Portcullis" #~ msgstr "Mreže" @@ -28651,4 +29218,11 @@ #~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Ďalší geotag(GPS poloha) plugin pre JOSM. Zľaďované obrázky s GPS " +#~ "stopami, alebo import EXIF geotagged(GPS poloha) obrázkov." + +#~ msgid "" #~ "Tools to work with authors/users. Selects map data that belongs to " #~ "selected user, opens browser showing selected author profile page." @@ -28684,7 +29258,4 @@ #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "Tip: Pri nahrávaní nových údajov zo servera nastali nejaké zmeny." - -#~ msgid "File could not be found." -#~ msgstr "Súbor nie je možné nájsť." #~ msgid "Some of the nodes are (almost) in the line" @@ -28807,7 +29378,4 @@ #~ msgid "Select a starting node on the end of a way" #~ msgstr "Vybrať a spustiť body na konci cesty" - -#~ msgid "Reached a junction" -#~ msgstr "Je dosiahnuté spojenie" #~ msgid "parameter '{0}' must not be null" @@ -29049,7 +29617,10 @@ #~ msgstr "Neznáme rozšírenie súboru pre súbor ''{0}''" -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" #~ msgstr "" -#~ "Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}" +#~ "Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie " +#~ "jednej požiadavky na zmenené pôvodné" #~ msgid "Can't search because there is no loaded data." @@ -29114,4 +29685,10 @@ #~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového " #~ "limitu servera. Výnimka bola: {1}" + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej " +#~ "potrebný." #~ msgid "" @@ -29241,4 +29818,11 @@ #~ "API verzia je ''0.5''. Got {1}" +#~ msgid "" +#~ "WARNING: no API version defined for data to upload. Falling back to " +#~ "version 0.6" +#~ msgstr "" +#~ "VAROVANIE: žiadna API verzia vymedzená pre dáta na nahratie. Ustúpiť do " +#~ "verzie 0.6" + #~ msgid "Preset group ''{0}'' of group ''{1}''" #~ msgstr "Prednastavená skupina ''{0}'' zo skupiny ''{1}''" @@ -29273,4 +29857,9 @@ #~ "or váš jazyk." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná." + #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade" @@ -29321,4 +29910,13 @@ #~ msgid "" +#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to " +#~ "use diff uploads, but API is not able to handle them. Ignoring diff " +#~ "upload." +#~ msgstr "" +#~ "Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady " +#~ "požadujú použiť rozdielne nahratie , ale API nie je schopného ovládať." +#~ "Ignorujem rozdielne nahrávanie." + +#~ msgid "" #~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back " #~ "to default geometry. Details: {1}" @@ -29326,4 +29924,11 @@ #~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre " #~ "východziu geometriu. Detaily: {1}" + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Niekoľko pomôcok(utilities) ktoré vám uľahčia život(prácu): napr. " +#~ "zjednodušenie cesty, spojiť plochy, skok na pozíciu." #~ msgid "" @@ -29353,4 +29958,7 @@ #~ msgstr "Nápoveda / o programe" +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu." + #~ msgid "Set manually the Lambert zone" #~ msgstr "Manuálne nastaviť Lambert zone" Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 19198) +++ /applications/editors/josm/i18n/po/sl.po (revision 19199) @@ -4,10 +4,11 @@ # FIRST AUTHOR , 2007. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-29 22:20+0000\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-06 15:38+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,38 +18,38 @@ "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: 2009-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Priprava grafičnega uporabniškega vmesnika" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Pomoč" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -60,21 +61,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -95,16 +96,7 @@ msgstr "Pozor" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" msgstr "" @@ -113,8 +105,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -122,10 +123,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -137,9 +138,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -148,6 +150,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -202,8 +204,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -271,5 +273,5 @@ msgstr "O JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -278,5 +280,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -285,5 +287,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -292,15 +294,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -309,29 +316,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -348,5 +356,9 @@ msgstr "Prekliči" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -362,5 +374,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "" @@ -378,15 +390,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Dodaj vozlišče..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Dodaj vozlišče z vpisom zemljepisne širine in dolžine" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -402,22 +414,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Uredi: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Vpišite koordinate novega vozlišča." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Uporabi decimalne stopinje." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negativne vrednosti pomenijo zahodno/južno poloblo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -426,5 +438,5 @@ msgstr "Z. širina" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -433,28 +445,29 @@ msgstr "Z. dolžina" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -466,9 +479,9 @@ msgstr "V redu" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -489,18 +502,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -512,5 +525,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -532,6 +545,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -578,5 +591,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" @@ -613,14 +626,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -630,21 +644,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Datoteka: {0}" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -msgid "There are no open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "" @@ -725,11 +739,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -807,16 +822,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -852,5 +872,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Podvoji" @@ -893,10 +913,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Izvoz v GPX ..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Izvoz v datoteko oblike GPX." @@ -911,12 +931,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -941,8 +961,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -953,10 +973,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -969,17 +989,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1016,22 +1036,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1041,38 +1066,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1080,33 +1101,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Razreši neskladja" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1269,5 +1290,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Predmetov ni možno prestaviti s tega sveta." @@ -1347,28 +1368,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Premakne vozlišča tako, da so koti med njimi 90 ali 270 stopinj" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1377,9 +1398,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1388,15 +1409,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" msgstr "" @@ -1470,18 +1491,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Obrni poti" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Obrni smer izbranih poti." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Izberite vsaj eno pot" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Obrni smer poti" @@ -1490,10 +1511,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Shrani" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Shrani trenutne podatke" @@ -1548,10 +1569,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Shrani kot..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Shrani trenutne podatke v novo datoteko" @@ -1593,6 +1614,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1624,5 +1644,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1689,5 +1709,5 @@ "sredini poti.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1695,5 +1715,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1701,5 +1721,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1733,43 +1753,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Izberite bodisi:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Eno vozlišče z oznakami" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Eno vozlišče, ki je del več poti, ali" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* Eno pot, ki ima eno ali več vozlišč, ki so del več poti, ali" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "* Eno pot in eno ali več njenih vozlišč, ki so del več poti." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1779,9 +1799,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1789,5 +1809,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1822,10 +1842,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1833,53 +1853,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Posodobi izbor" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Izbor je prazen" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1888,5 +1904,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1894,131 +1910,7 @@ msgstr "Ni sprememb za pošiljanje." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Ni česa poslati. Najprej pridobite kakšne podatke." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2153,9 +2045,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Sprejem podatkov" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2163,5 +2055,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2232,7 +2124,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2247,58 +2139,52 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Nariši" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Nariši vozlišča" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "izbrano" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Ni mogoče dodati vozlišča izven tega sveta." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Dodaj vozlišče" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Dodaj vozlišče v pot" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Poveži obstoječo pot z vozliščem" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Dodaj novo vozlišče v pot" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Dodaj in poveži vozlišče v pot" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Ustvari novo vozlišče." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Izberi vozlišče pod kazalcem miške." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2309,14 +2195,14 @@ msgstr[3] "Vstavi novo vozlišče v {0} poti." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Začni novo pot od zadnjega vozlišča" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Nadaljuj pot od zadnjega vozlišča." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Zaključi risanje." @@ -2355,18 +2241,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Izberite" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Izberi, premakni ali zasuči predmete" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2375,17 +2262,17 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Premakni elemente" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Premakni jih" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Razveljavi premik" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2395,13 +2282,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2410,9 +2297,9 @@ "najbližjo točko." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Za prenehanje vrtenja izpustite miškin gumb." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2422,5 +2309,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Povečava" @@ -2442,5 +2329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Iskanje predmetov." @@ -2536,8 +2423,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2545,45 +2440,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2591,55 +2492,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Začni iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Najdeno {0} zadetkov" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2649,40 +2550,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +msgid "Missing parameter for OR" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +msgid "Missing right parent" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +msgid "Missing operator for NOT" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2691,9 +2592,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2702,7 +2603,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2736,17 +2642,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 -msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 #, java-format msgid "" @@ -2754,5 +2648,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 #, java-format msgid "" @@ -2761,11 +2655,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgid "API Capabilities Violation" msgstr "" @@ -2880,5 +2778,5 @@ msgstr "Nastavi {0}={1} pri {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2893,5 +2791,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -2989,4 +2887,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3098,5 +3011,5 @@ msgstr "Uveljavim?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3178,15 +3091,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3195,5 +3108,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3202,5 +3115,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3209,5 +3122,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3216,5 +3129,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3222,5 +3135,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3229,5 +3142,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3236,5 +3149,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3243,5 +3156,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3250,10 +3163,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3261,24 +3174,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Nastavitve shranjene na {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3287,5 +3200,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3314,5 +3227,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3334,31 +3247,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "J" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "S" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "Z" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3366,5 +3272,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3375,27 +3281,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3403,5 +3309,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3413,5 +3319,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3419,25 +3325,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3445,43 +3351,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "parameter ''{0}'' ne sme biti ničen" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3489,5 +3407,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3515,10 +3433,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3526,7 +3440,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3541,5 +3455,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3557,146 +3471,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Neznana vloga ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "besedilo" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Napaka: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Opozorilo: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "izbrano" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3707,6 +3613,6 @@ msgstr[3] "vozlišča" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3717,7 +3623,8 @@ msgstr[3] "poti" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3728,20 +3635,36 @@ msgstr[3] "relacije" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "nepopolna pot" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "ozadje" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" +msgstr "" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "besedilo" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" msgstr "" @@ -3884,5 +3807,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "železnica" @@ -3898,7 +3821,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3918,4 +3841,10 @@ msgstr[3] "{0} člani" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3947,6 +3876,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Spor" @@ -3960,7 +3889,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4039,74 +3968,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Uporabniško ime" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Geslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "uporaba" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Prikaži to pomoč" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Sprejmi pravokotno področje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Odpri datoteko (če .gpx, potem kot surov GPS)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Sprejmi pravokotno področje GPS podatkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Ponastavi nastavitve na privzete" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Nastavi jezik." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4115,9 +4044,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "primeri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4125,36 +4054,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktiviranje posodobljenih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Nalaganje zgodnjih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Privzete nastavitve" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Nalaganje vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Datoteka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4169,22 +4098,22 @@ msgstr "Uredi" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Pogled" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Orodja" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Prednastavitve" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4192,5 +4121,5 @@ msgstr "Meni: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Zvok" @@ -4269,13 +4198,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "plasti ni na seznamu." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4308,5 +4238,5 @@ msgstr "Pripravljanje" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4314,6 +4244,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4322,5 +4252,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4329,5 +4259,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4336,25 +4266,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4362,9 +4292,9 @@ msgstr "Vloga" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4396,11 +4326,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Lastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4409,6 +4339,6 @@ msgstr "Oznake" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4416,6 +4346,6 @@ msgstr "Vozlišča" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4423,40 +4353,40 @@ msgstr "Člani" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4464,21 +4394,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4510,22 +4440,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4533,5 +4463,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4539,30 +4469,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4570,5 +4500,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4576,14 +4506,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4591,5 +4521,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4597,23 +4527,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Gor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Premakni izbrani element za eno mesto višje" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Dol" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Premakni izbrani element za eno mesto nižje" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4624,27 +4554,27 @@ msgstr "Odstrani" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Zamrzni" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Zamrzni" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Odmrzni" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4653,5 +4583,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4660,5 +4590,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4667,5 +4597,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4674,5 +4604,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4681,5 +4611,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4689,5 +4619,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4922,10 +4852,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4935,10 +4865,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5023,9 +4953,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5033,6 +4963,6 @@ msgstr "brez" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "" @@ -5121,7 +5051,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5131,6 +5061,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5238,4 +5168,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Izbriši izbrane predmete." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Sprememba vrednosti?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Sprejemanje" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Sprejmi podatke zemljevida s strežnika OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Izbriši izbrane predmete." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Odpri urejevalnik za izbrano relacijo" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5249,12 +5231,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5272,18 +5254,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Razreši" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5291,25 +5273,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5321,26 +5303,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5351,41 +5333,41 @@ msgstr "Dodaj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5424,5 +5406,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5437,34 +5419,34 @@ msgstr "Odpri seznam vseh naloženih plasti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Izbriši izbrano plast." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Prikaži/skrij" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Preklopi vidljivost izbrane plasti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Pomakni izbrano plast vrstico višje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Pomakni izbrano plast vrstico nižje." @@ -5474,5 +5456,175 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relacije" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Odpri seznam vseh relacij." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Odpri urejevalnik za izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Izbriši izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Ustvari novo relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Trenutni izbor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Odpri okno s seznamom izbora" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Povečava na izbrane predmete" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Povečava na ves izbor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Izbor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Avtorji" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Odpri seznam ljudi, ki delajo na izbranih predmetih." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Avtor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "Št. predmetov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "nepopoln" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "Zapri" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Sprejmi seznam" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5481,22 +5633,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Sprememba vrednosti?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5507,5 +5659,5 @@ msgstr[3] "Spremeni lastnosti do {0} predmetov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5516,226 +5668,71 @@ msgstr[3] "Spremenili boste do {0} predmete." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Izberite ključ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Izberite vrednost" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Lastnosti/Članstva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Lastnosti izbranih predmetov" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Latnosti: {0} / Članstva: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Lastnosti / Članstva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Spremeni relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Naj res izbrišem izbor iz relacije {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Izbriši izbrani ključ vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Dodaj nov par ključ/vrednost vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Spremeni vrednost izbranega ključa vsem predmetom." - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relacije" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Odpri seznam vseh relacij." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Odpri urejevalnik za izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Izbriši izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Ustvari novo relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Trenutni izbor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Odpri okno s seznamom izbora" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Povečava na izbrane predmete" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Povečava na ves izbor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Izbor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Avtorji" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Odpri seznam ljudi, ki delajo na izbranih predmetih." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Avtor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "Št. predmetov" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5797,16 +5794,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Sprejmi vse nepopolne poti in vozlišča v relaciji" -msgstr[1] "Sprejmi vse nepopolne poti in vozlišča v relaciji" -msgstr[2] "Sprejmi vse nepopolne poti in vozlišča v relaciji" -msgstr[3] "Sprejmi vse nepopolne poti in vozlišča v relaciji" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Mesto vira sprejema" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5829,14 +5823,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Uporabi prednastavitev" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Odpri urejevalnik za izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5845,14 +5837,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5862,9 +5854,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5874,15 +5866,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5890,5 +5882,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5896,20 +5888,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5918,70 +5910,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Šport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5990,9 +5981,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6001,48 +5992,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6052,34 +6042,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6191,10 +6181,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6204,5 +6194,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6287,9 +6277,4 @@ msgid "Download Area" msgstr "Sprejmi področje" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Sprejemanje" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6589,6 +6574,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6601,6 +6584,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6871,4 +6852,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7091,5 +7076,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7132,116 +7117,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Naziv" @@ -7265,15 +7250,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Vrsta" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7444,10 +7429,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7455,5 +7440,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7461,9 +7446,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7578,6 +7563,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "neznan" @@ -7599,13 +7584,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7640,4 +7625,116 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7656,39 +7753,144 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +msgid "Upload to a new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +msgid "Upload to an existing changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Shrani uporabniško ime in geslo (nekriptirano)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +msgid "Please enter the user name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Pozor: Geslo se prenaša nekriptirano" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Samodejno centriraj" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Spremeni relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7755,17 +7957,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7778,9 +7980,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7794,9 +7996,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7811,50 +8013,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Zavrzi in končaj" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7862,5 +8064,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7933,40 +8135,380 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "Advanced" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Nastavi razpoložljive vstavke." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Neznana vloga ''{0}''." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "O programu" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Prosim izberite vrstico za izbris." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Novi predmeti:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Spremenjeni predmeti:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Izbrisani predmeti:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7975,5 +8517,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -7982,5 +8524,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -7989,210 +8531,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Prosim, vnesite želene koordinate." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Prosim, vpišite iskani niz" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "točka GPS" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Riši povezave med točkami na tej plasti." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Ne riši povezav med točkami na tej plasti." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8200,5 +8569,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8207,5 +8576,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8287,5 +8656,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Opis" @@ -8317,10 +8686,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Pretvori v podatkovno plast" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8328,12 +8697,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8342,29 +8711,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Sprejmi iz OSM vzdolž te sledi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Sprejmi vse znotraj:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8375,9 +8744,9 @@ "nadaljevati?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8385,5 +8754,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8391,23 +8760,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "izven sprejetega področja" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8416,5 +8785,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8428,5 +8797,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8439,11 +8808,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8452,36 +8821,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} je sestavljen iz:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Pretvori v plast GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8489,5 +8858,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8496,5 +8865,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8504,5 +8873,5 @@ msgstr[3] "točke" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8513,5 +8882,5 @@ msgstr[3] "sled z {0} točkami" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8520,5 +8889,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8529,24 +8898,24 @@ msgstr[3] "{0} točke" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Datoteke GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Napaka pri razčlenjevanju {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Ni bilo možno prebrati \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8555,34 +8924,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8590,69 +8959,154 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +msgid "Override position for: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Vse slike" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "izbrano" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8661,9 +9115,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8672,134 +9122,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Berem {0}..." +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 +#, java-format +msgid "Unable to get canonical path for directory {0}\n" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 +#, java-format +msgid "Scanning directory {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 -#, java-format -msgid "Scanning directory {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 -#, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Slike z geografskim položajem" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8809,52 +9181,96 @@ msgstr[3] "slike" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Datoteke ni bilo moč najti." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Ni slike" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Napaka v datoteki {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Prikaži slike z geografskim položajem" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +msgid "Show previous Image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Pogled: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Odstrani fotografijo iz plasti" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +msgid "Delete File from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +msgid "Show next Image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8863,5 +9279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8955,4 +9371,12 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "Error displaying URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" msgstr "" @@ -9166,7 +9590,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "" @@ -9235,6 +9658,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Kolo" @@ -9621,31 +10044,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Omogoči posredovalni strežnik" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonimno" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Bolnišnica" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "šport" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Geslo" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Nastavitve posredovalnega strežnika" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Ime posredovalnega strežnika" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Vrata posredovalnega strežnika" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Uporabniško ime na posredovalnem strežniku" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Geslo na posredovalnem strežniku" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Osnovni URL naslov strežnika" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM geslo" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9925,5 +10407,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9933,13 +10415,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9947,18 +10429,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9969,16 +10451,16 @@ msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -9989,18 +10471,18 @@ msgstr[3] "Spremeni {0} predmete" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Uporabi prednastavitev" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Spremeni lastnosti" @@ -10029,4 +10511,11 @@ msgstr "Sprejem točk od {0} do {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10042,12 +10531,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Pripravljam podatke..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10150,16 +10694,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10169,40 +10713,40 @@ msgstr "Sprejemanje podatkov OSM..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10210,12 +10754,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Sprejem točk od {0} do {1}..." -msgstr[1] "Sprejem točk od {0} do {1}..." -msgstr[2] "Sprejem točk od {0} do {1}..." -msgstr[3] "Sprejem točk od {0} do {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10252,14 +10794,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10268,16 +10810,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10285,66 +10827,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Pripravljanje..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Pošiljanje ..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Pripravljam podatke..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Spremeni {0} predmetov" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10370,4 +10923,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10379,5 +10942,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10404,5 +10967,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10410,5 +10973,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10421,5 +10984,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10430,57 +10993,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Napačno uporabniško ime ali geslo." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Pozor: Geslo se prenaša nekriptirano" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Shrani uporabniško ime in geslo (nekriptirano)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Vnesite geslo" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Osnovni URL naslov strežnika" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM geslo" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10570,5 +11082,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10577,38 +11096,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10616,19 +11135,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "predmet z id=0 ni dovoljen" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10638,8 +11157,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10649,25 +11168,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10675,5 +11210,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10682,5 +11217,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10688,5 +11223,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10695,13 +11230,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Priprava podatkov OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10724,21 +11259,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Sprejemanje podatkov OSM..." +msgstr[1] "Sprejemanje podatkov OSM..." +msgstr[2] "Sprejemanje podatkov OSM..." +msgstr[3] "Sprejemanje podatkov OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Sprejem točk od {0} do {1}..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10766,9 +11315,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10829,5 +11374,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10836,4 +11381,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +msgid "Unexpected id 0 for osm primitive found" msgstr "" @@ -10876,12 +11425,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Izbriši {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Napaka pri brisanju datoteke vstavka: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11023,9 +11572,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "opis ni na voljo" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11159,4 +11708,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11439,6 +12003,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Pošiljanje sledi" @@ -11524,5 +12088,5 @@ msgstr "Pošiljanje sledi GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Pošlji sledi na openstreetmap.org" @@ -11533,5 +12097,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Interpolacija naslovov" @@ -11546,11 +12110,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11571,12 +12132,10 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "slik" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Izposojevalnica" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11706,5 +12265,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11766,21 +12325,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11789,13 +12348,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11820,17 +12379,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11842,18 +12401,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11861,5 +12420,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11867,52 +12426,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12114,5 +12670,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12303,5 +12859,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Ni naloženih podatkov." @@ -12323,9 +12879,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12711,7 +13267,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "" @@ -12861,19 +13417,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "" @@ -12912,33 +13468,33 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Zajemi GPS sled" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" "Povezava s strežnikom gpsd in prikaz trenutnega položaja na plasti LiveGPS." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Centriraj zdaj" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Centiraj plast LiveGPS na trenuten položaj." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Samodejno centriraj" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Nenehno centriraj plast LiveGPS na trenutni položaj." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "" @@ -12989,9 +13545,9 @@ msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "merilni način" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "" @@ -13029,5 +13585,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13038,13 +13594,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13185,5 +13741,5 @@ msgstr "" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13275,5 +13831,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13349,41 +13905,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Naloži ploščico" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Naloži vse ploščice" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13552,4 +14108,41 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Ceste" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +msgid " is not a number" +msgstr "" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13568,41 +14161,19 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Ime ceste" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" msgstr "" @@ -13618,5 +14189,5 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Mreža" @@ -14263,38 +14834,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "zgradba" @@ -14308,5 +14849,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "" @@ -14421,10 +14962,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15122,6 +15663,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "" @@ -15567,5 +16108,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "" @@ -15683,5 +16224,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15693,5 +16234,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "" @@ -15949,4 +16490,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -15978,8 +16522,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "da" @@ -16127,9 +16673,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "" @@ -16374,5 +16921,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "" @@ -16407,5 +16954,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "" @@ -16439,6 +16986,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "" @@ -16488,5 +17035,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "krožišče" @@ -16674,6 +17221,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "" @@ -16794,5 +17341,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16818,4 +17364,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16825,15 +17372,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "" @@ -17045,7 +17592,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "" @@ -17464,5 +18011,5 @@ msgstr "" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17472,5 +18019,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "" @@ -17996,32 +18543,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "" @@ -18080,91 +18627,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18179,5 +18726,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18196,7 +18743,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "" @@ -18212,5 +18759,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "" @@ -18223,6 +18770,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "" @@ -18261,22 +18808,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "" @@ -18284,5 +18819,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Izposojevalnica" @@ -18291,10 +18826,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Uredi izposojevalnico avtomobilov" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "" @@ -18302,5 +18837,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "" @@ -18308,10 +18843,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "" @@ -18320,22 +18855,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Uredi izposojevalnico koles" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Javni prevoz" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18345,5 +18873,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18351,5 +18879,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18357,5 +18885,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Železniško postajališče" @@ -18363,5 +18891,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -18369,5 +18897,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -18376,5 +18904,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -18382,5 +18910,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Železniški peron" @@ -18389,5 +18917,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Uredi železniški peron" @@ -18399,5 +18927,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18405,10 +18933,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Vhod v podzemno" @@ -18417,10 +18945,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Uredi vhod v podzemno" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -18429,5 +18957,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Avtobusna postaja" @@ -18436,5 +18964,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Uredi avtobusno postajo" @@ -18442,5 +18970,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Avtobusno postajališče" @@ -18450,5 +18978,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Uredu avtobusno postajališče" @@ -18457,17 +18985,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Klopca" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Avtobusni peron" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Uredi avtobusni peron" @@ -18475,5 +19011,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taksi" @@ -18481,5 +19017,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Uredi postajališče taksijev" @@ -18487,5 +19023,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Letališče" @@ -18493,15 +19029,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "" @@ -18509,10 +19045,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Nastanitev" @@ -18524,5 +19060,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -18531,15 +19067,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "" @@ -18547,20 +19083,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "" @@ -18568,10 +19104,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "" @@ -18579,30 +19115,30 @@ #. item "Travel/Accomodation/Hostel" #. +#: build/trans_presets.java:1596 +msgid "Edit Hostel" +msgstr "" + +#. item "Travel/Accomodation/Hostel" text "Name" +#: build/trans_presets.java:1600 +msgid "Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" +#: build/trans_presets.java:1601 +msgid "Edit Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" text "Elevation" +#: build/trans_presets.java:1606 +msgid "Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" #: build/trans_presets.java:1607 -msgid "Edit Hostel" -msgstr "" - -#. item "Travel/Accomodation/Hostel" text "Name" +msgid "Edit Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" text "Name" #: build/trans_presets.java:1611 -msgid "Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 -msgid "Edit Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 -msgid "Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 -msgid "Edit Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 msgid "Camping Site" msgstr "" @@ -18610,10 +19146,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Hrana in pijača" @@ -18624,5 +19160,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "" @@ -18630,5 +19166,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "" @@ -18636,5 +19172,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "" @@ -18642,61 +19178,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "" @@ -18704,9 +19240,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "" @@ -18714,9 +19250,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pivnica" @@ -18724,18 +19260,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Uredi pivnico" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "" @@ -18743,9 +19279,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "" @@ -18753,24 +19289,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turizem" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Muzej" @@ -18778,9 +19314,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Uredi muzej" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Živalski vrt" @@ -18789,9 +19325,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Uredi živalski vrt" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Razgledišče" @@ -18799,24 +19335,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Uredi razgledišče" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Umetnina" @@ -18824,5 +19360,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Uredi umetnino" @@ -18830,19 +19366,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Zemljevid" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18880,5 +19416,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18886,28 +19422,28 @@ msgstr "" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -18917,5 +19453,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18923,6 +19459,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Kolesarjenje" @@ -18930,5 +19466,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -18936,6 +19472,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Smučanje" @@ -18943,5 +19479,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -18949,46 +19485,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -18996,29 +19532,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "" @@ -19026,25 +19562,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Zgodovinski kraji" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Grad" @@ -19053,19 +19589,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Uredi grad" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruševine" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Uredi ruševine" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Arheološko najdišče" @@ -19074,9 +19610,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Uredi arheološko najdišče" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "" @@ -19084,10 +19620,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19095,5 +19631,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19101,15 +19637,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "" @@ -19117,55 +19653,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 msgid "Leisure" msgstr "Prosti čas" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Vodni park" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Uredi vodni park" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Igrišče" @@ -19173,35 +19709,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Uredi igrišče" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Ribarjenje" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Uredi ribarjenje" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Uredi stadion" @@ -19215,6 +19751,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "izberite šport:" @@ -19606,30 +20142,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "šport" @@ -19639,225 +20175,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "lokostrelstvo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "košarka" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "plezanje" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "kolesarjenje" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gimnastika" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hokej" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "strelišče" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "smučanje" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "nogomet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "plavanje" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "namizni_tenis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tenis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Športno središče" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Uredi športno središče" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golf igrišče" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Uredi golf igrišče" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Mini golf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Uredi mini golf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Šport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -19896,21 +20432,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "vrsta" @@ -19949,203 +20485,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" +#: build/trans_presets.java:1942 +msgid "Edit 10pin" +msgstr "" + +#: build/trans_presets.java:1947 +msgid "Athletics" +msgstr "" + +#. item "Sport/Athletics" +#: build/trans_presets.java:1948 +msgid "Edit Athletics" +msgstr "" + #: build/trans_presets.java:1953 -msgid "Edit 10pin" -msgstr "" - -#: build/trans_presets.java:1958 -msgid "Athletics" -msgstr "" - -#. item "Sport/Athletics" -#: build/trans_presets.java:1959 -msgid "Edit Athletics" -msgstr "" - -#: build/trans_presets.java:1964 msgid "Archery" msgstr "Lokostrelstvo" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Uredi lokostrelstvo" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Plezanje" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Uredi plezanje" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Uredi kolesarjenje" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Pasje dirke" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Uredi pasje dirke" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Konjske dirke" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Uredi konjske dirke" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gimnastika" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Uredi gimnastiko" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "" #. item "Sport/Motor Sports" +#: build/trans_presets.java:2002 +msgid "Edit Motor Sports" +msgstr "" + +#: build/trans_presets.java:2007 +msgid "Skating" +msgstr "" + +#. item "Sport/Skating" +#: build/trans_presets.java:2008 +msgid "Edit Skating" +msgstr "" + #: build/trans_presets.java:2013 -msgid "Edit Motor Sports" -msgstr "" - -#: build/trans_presets.java:2018 -msgid "Skating" -msgstr "" - -#. item "Sport/Skating" +msgid "Skateboard" +msgstr "" + +#. item "Sport/Skateboard" +#: build/trans_presets.java:2014 +msgid "Edit Skateboard" +msgstr "" + #: build/trans_presets.java:2019 -msgid "Edit Skating" -msgstr "" - -#: build/trans_presets.java:2024 -msgid "Skateboard" -msgstr "" - -#. item "Sport/Skateboard" -#: build/trans_presets.java:2025 -msgid "Edit Skateboard" -msgstr "" - -#: build/trans_presets.java:2030 msgid "Swimming" msgstr "Plavanje" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Uredi plavanje" @@ -20153,56 +20689,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Uredi smučanje" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Strelišče" @@ -20210,182 +20746,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Uredi strelišče" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Šport (z žogo)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Nogomet" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Uredi nogomet" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "" #. item "Sport (Ball)/Football" +#: build/trans_presets.java:2050 +msgid "Edit Football" +msgstr "" + +#: build/trans_presets.java:2055 +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2056 +msgid "Edit Australian Football" +msgstr "" + #: build/trans_presets.java:2061 -msgid "Edit Football" -msgstr "" - -#: build/trans_presets.java:2066 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" +msgid "Baseball" +msgstr "" + +#. item "Sport (Ball)/Baseball" +#: build/trans_presets.java:2062 +msgid "Edit Baseball" +msgstr "" + #: build/trans_presets.java:2067 -msgid "Edit Australian Football" -msgstr "" - -#: build/trans_presets.java:2072 -msgid "Baseball" -msgstr "" - -#. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 -msgid "Edit Baseball" -msgstr "" - -#: build/trans_presets.java:2078 msgid "Basketball" msgstr "Košarka" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Uredi košarko" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Uredi golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golf_igrišče" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" +#: build/trans_presets.java:2080 +msgid "Edit Boule" +msgstr "" + +#: build/trans_presets.java:2085 +msgid "Bowls" +msgstr "" + +#. item "Sport (Ball)/Bowls" +#: build/trans_presets.java:2086 +msgid "Edit Bowls" +msgstr "" + #: build/trans_presets.java:2091 -msgid "Edit Boule" -msgstr "" - -#: build/trans_presets.java:2096 -msgid "Bowls" -msgstr "" - -#. item "Sport (Ball)/Bowls" +msgid "Cricket" +msgstr "" + +#. item "Sport (Ball)/Cricket" +#: build/trans_presets.java:2092 +msgid "Edit Cricket" +msgstr "" + #: build/trans_presets.java:2097 -msgid "Edit Bowls" -msgstr "" - -#: build/trans_presets.java:2102 -msgid "Cricket" -msgstr "" - -#. item "Sport (Ball)/Cricket" +msgid "Cricket Nets" +msgstr "" + +#. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + #: build/trans_presets.java:2103 -msgid "Edit Cricket" -msgstr "" - -#: build/trans_presets.java:2108 -msgid "Cricket Nets" -msgstr "" - -#. item "Sport (Ball)/Cricket Nets" +msgid "Croquet" +msgstr "" + +#. item "Sport (Ball)/Croquet" +#: build/trans_presets.java:2104 +msgid "Edit Croquet" +msgstr "" + #: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 -msgid "Croquet" -msgstr "" - -#. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 -msgid "Edit Croquet" -msgstr "" - -#: build/trans_presets.java:2120 msgid "Hockey" msgstr "Hokej" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Uredi hokej" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + +#: build/trans_presets.java:2121 +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" +msgid "Rugby" +msgstr "" + +#. item "Sport (Ball)/Rugby" +#: build/trans_presets.java:2128 +msgid "Edit Rugby" +msgstr "" + #: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2144 msgid "Table Tennis" msgstr "Namizni tenis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Uredi namizni tenis" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Uredi tenis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Zgradbe" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Zgradba" @@ -20393,5 +20929,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Javne zgradbe" @@ -20399,10 +20935,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Uredi javno zgradbo" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Mestna hiša" @@ -20410,10 +20946,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Uredi mestno hišo" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Veleposlaništvo" @@ -20421,10 +20957,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Uredi veleposlaništvo" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Sodišče" @@ -20433,10 +20969,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Uredi sodišče" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Zapor" @@ -20445,10 +20981,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Uredi zapor" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Policijska postaja" @@ -20458,10 +20994,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Uredi policijsko postajo" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Gasilski dom" @@ -20470,10 +21006,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Uredi gasilski dom" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Pošta" @@ -20481,5 +21017,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Uredi pošto" @@ -20487,15 +21023,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Šola" @@ -20503,10 +21039,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Uredi šolo" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "" @@ -20514,10 +21050,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "" @@ -20525,5 +21061,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "" @@ -20531,5 +21067,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Kinematograf" @@ -20538,10 +21074,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Uredi kinematograf" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Knjižnica" @@ -20550,9 +21086,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Uredi knjižnico" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "" @@ -20560,10 +21096,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Gledališče" @@ -20572,10 +21108,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Uredi gledališče" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Kraj čaščenja" @@ -20585,5 +21121,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Uredi kraj čaščenja" @@ -20592,6 +21128,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Vera" @@ -20600,66 +21136,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "" @@ -20668,81 +21204,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Naslovi" @@ -20751,5 +21287,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Urejanje podatkov o naslovu" @@ -20757,5 +21293,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "" @@ -20763,20 +21299,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Ime ceste" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Poštna številka" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "" @@ -20785,5 +21326,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Uredi interpolacijo naslovov" @@ -20791,61 +21332,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Stolp" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Uredi stolp" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20853,25 +21394,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Vodni stolp" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Uredi vodni stolp" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Svetilnik" @@ -20879,10 +21420,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Uredi svetilnik" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Mlin na veter" @@ -20890,10 +21431,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Uredi mlin na veter" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Cevovod" @@ -20902,37 +21443,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Uredi cevovod" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Čistilna naprava" @@ -20942,10 +21483,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Uredi čistilno napravo" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Žerjav" @@ -20953,10 +21494,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Uredi žerjav" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "" @@ -20964,10 +21505,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Geodetska točka" @@ -20975,10 +21516,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Uredi geodetsko točko" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Video nadzor" @@ -20986,5 +21527,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Uredi video nadzorno kamero" @@ -20992,5 +21533,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "" @@ -21000,35 +21541,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "" @@ -21037,10 +21578,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "" @@ -21049,5 +21590,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "" @@ -21055,10 +21596,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Steber daljnovoda" @@ -21069,23 +21610,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Uredi steber daljnovoda" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "" @@ -21094,75 +21635,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Stranišča" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Poštni nabiralnik" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefon" @@ -21171,5 +21712,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Uredi telefon" @@ -21177,5 +21718,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Kovanci" @@ -21183,5 +21724,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Bankovci" @@ -21189,5 +21730,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21195,5 +21736,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Debetne kartice" @@ -21201,15 +21742,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kreditne kartice" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefonske kartice" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Recikliranje" @@ -21218,5 +21759,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Uredi raciklažno točko" @@ -21224,68 +21765,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Klopca" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21356,39 +21892,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "" @@ -21397,30 +21933,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "" @@ -21429,10 +21965,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Pitna voda" @@ -21441,10 +21977,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Uredi pitno vodo" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21452,33 +21988,56 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Trgovine" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +msgid "Bike Dealer" +msgstr "" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "" @@ -21486,9 +22045,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "" @@ -21496,27 +22055,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Prodajni avtomat" @@ -21524,5 +22083,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Uredi prodajni avtomat" @@ -21530,88 +22089,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Prodajani izdelki" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "pijača" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM kartice" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Mesar" @@ -21619,9 +22178,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Uredi mesarja" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Pekarna" @@ -21629,9 +22188,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Uredi pekarno" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "" @@ -21639,18 +22198,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21658,54 +22217,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "" @@ -21713,9 +22272,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21723,9 +22282,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Sam svoj mojster" @@ -21733,54 +22292,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Uredi sam svoj mojster trgovino" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Čistilnica" @@ -21788,9 +22347,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Uredi čistilnico" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Pralnica" @@ -21798,9 +22357,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Uredi pralnico" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "" @@ -21808,28 +22367,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Denar" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banka" @@ -21837,14 +22396,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Uredi banko" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Menjalnica" @@ -21852,5 +22411,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Uredi menjalnico" @@ -21858,15 +22417,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Uredi bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Zdravje" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "" @@ -21874,18 +22433,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Lekarna" @@ -21893,5 +22452,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Uredi lekarno" @@ -21899,9 +22458,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Bolnišnica" @@ -21909,10 +22468,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Uredi bolnišnico" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -21921,5 +22480,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -21928,20 +22487,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -21949,5 +22508,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "" @@ -21956,64 +22515,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Kraji" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Uredi kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Država" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Uredi državo" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "" @@ -22021,15 +22580,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "" @@ -22037,10 +22596,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "" @@ -22048,25 +22607,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Vas" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Uredi vas" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Zaselek" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Uredi zaselek" @@ -22074,5 +22633,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "" @@ -22080,10 +22639,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Otok" @@ -22091,10 +22650,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Uredi otok" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22102,5 +22661,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22108,5 +22667,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "" @@ -22114,10 +22673,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Vrh" @@ -22125,10 +22684,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Uredi vrh" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "" @@ -22136,10 +22695,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "" @@ -22147,70 +22706,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Meje" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Raba tal" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Drevo" @@ -22219,15 +22778,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Uredi drevo" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "" @@ -22236,5 +22795,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "" @@ -22242,17 +22801,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Gozd" @@ -22261,14 +22820,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Uredi gozdnata tla" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Naravni rezervat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Uredi naravni rezervat" @@ -22276,25 +22835,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22302,10 +22861,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "" @@ -22313,5 +22872,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "" @@ -22319,5 +22878,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "" @@ -22326,45 +22885,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vinograd" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Uredi vinograd" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "" @@ -22372,25 +22931,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22398,10 +22957,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22409,20 +22968,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "" @@ -22430,5 +22989,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -22436,15 +22995,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Pokopališče" @@ -22452,9 +23011,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Uredi pokopališče" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "" @@ -22462,39 +23021,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Ozemlje železnice" @@ -22502,15 +23061,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Uredi ozemlje železnice" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "" @@ -22518,55 +23077,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Gradbišče" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Kamnolom" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Uredi kamnolom" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "" @@ -22576,5 +23135,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "" @@ -22583,10 +23142,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "" @@ -22594,5 +23153,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22601,5 +23160,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22607,34 +23166,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "" @@ -22643,15 +23202,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "" @@ -22659,5 +23218,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22666,5 +23225,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22672,5 +23231,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22742,24 +23301,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22812,5 +23371,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22819,13 +23378,13 @@ msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -22839,10 +23398,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -22850,31 +23409,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -22883,30 +23442,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23117,130 +23676,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23257,98 +23690,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "" @@ -23725,7 +24067,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23789,13 +24131,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23811,5 +24232,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23823,5 +24244,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23842,5 +24263,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "" @@ -23855,5 +24276,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23868,5 +24289,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "" @@ -23880,5 +24301,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "" @@ -23892,5 +24313,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "" @@ -23912,16 +24333,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24018,4 +24427,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24084,13 +24500,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24136,6 +24552,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24152,7 +24568,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24175,10 +24591,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24214,11 +24630,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24259,6 +24676,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24272,5 +24689,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "" @@ -24292,5 +24709,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24304,5 +24721,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24310,4 +24727,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24357,7 +24781,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "" @@ -24374,5 +24798,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24387,5 +24811,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24400,5 +24824,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24413,5 +24837,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24426,5 +24850,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24439,5 +24863,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24557,11 +24981,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "" @@ -24575,5 +24999,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "" @@ -24587,5 +25011,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "" @@ -24713,12 +25137,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "" @@ -24732,5 +25173,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "" @@ -24768,4 +25209,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24784,4 +25241,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24802,8 +25267,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -24905,10 +25372,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25162,5 +25629,5 @@ #. #. -#. +#. #. color health #. @@ -25306,4 +25773,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25323,23 +25798,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25371,6 +25846,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25431,14 +25906,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25785,5 +26260,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25806,5 +26280,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "" @@ -25876,8 +26351,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "" @@ -25978,9 +26453,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "" @@ -26068,9 +26543,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "" @@ -26084,5 +26559,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "" @@ -26096,5 +26571,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26116,5 +26591,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "" @@ -26128,5 +26603,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "" @@ -26140,5 +26615,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26161,5 +26636,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "" @@ -26173,5 +26648,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "" @@ -26185,5 +26660,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26197,5 +26672,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26209,5 +26684,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26264,7 +26739,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "" @@ -26278,5 +26753,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "" @@ -26289,5 +26764,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "" @@ -26302,5 +26777,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "" @@ -26314,5 +26789,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "" @@ -26367,8 +26842,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26382,5 +26857,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "" @@ -26394,5 +26869,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "" @@ -26406,5 +26881,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26418,5 +26893,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "" @@ -26430,5 +26905,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "" @@ -26506,8 +26981,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "" @@ -26555,7 +27030,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "" @@ -26705,11 +27180,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "" @@ -26757,6 +27232,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "" @@ -27112,27 +27587,57 @@ msgstr "" +#~ msgid "All images" +#~ msgstr "Vse slike" + +#~ msgid "Enable proxy server" +#~ msgstr "Omogoči posredovalni strežnik" + +#~ msgid "Anonymous" +#~ msgstr "Anonimno" + +#~ msgid "Proxy server host" +#~ msgstr "Ime posredovalnega strežnika" + +#~ msgid "Proxy server port" +#~ msgstr "Vrata posredovalnega strežnika" + +#~ msgid "Proxy server username" +#~ msgstr "Uporabniško ime na posredovalnem strežniku" + +#~ msgid "Proxy server password" +#~ msgstr "Geslo na posredovalnem strežniku" + +#~ msgid "Preparing..." +#~ msgstr "Pripravljanje..." + +#~ msgid "Uploading..." +#~ msgstr "Pošiljanje ..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Napačno uporabniško ime ali geslo." + +#~ msgid "Enter Password" +#~ msgstr "Vnesite geslo" + +#~ msgid "Move" +#~ msgstr "Premakni" + +#~ msgid "Data Layer" +#~ msgstr "Podatkovna plast" + +#~ msgid "No data imported." +#~ msgstr "Nič podatkov ni bilo uvoženih." + +#~ msgid "Select a bookmark first." +#~ msgstr "Najprej izberite zaznamek." + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}" + #~ msgid "No time for point {0} x {1}" #~ msgstr "Točka {0} x {1} nima časovne oznake" -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Ni moč najti slik z berljivo časovno oznako." - -#~ msgid "GPS start: {0}" -#~ msgstr "Začetek GPS sledi: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "Konec GPS sledi: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "trenutna razlika: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "razlika časovnih pasov: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} znotraj sledi." +#~ msgid "Image" +#~ msgstr "Slika" #~ msgid "Sync clock" @@ -27144,34 +27649,4 @@ #~ msgid "There is no EXIF time within the file \"{0}\"." #~ msgstr "V datoteki \"{0}\" manjka EXIF čas." - -#~ msgid "Image" -#~ msgstr "Slika" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Uskladite čas z GPS napravo" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Vpisanega časa ni bilo mogoče razpoznati." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - slike z geografskim položajem" - -#~ msgid "Move" -#~ msgstr "Premakni" - -#~ msgid "Data Layer" -#~ msgstr "Podatkovna plast" - -#~ msgid "No data imported." -#~ msgstr "Nič podatkov ni bilo uvoženih." - -#~ msgid "Select a bookmark first." -#~ msgstr "Najprej izberite zaznamek." - -#~ msgid "File could not be found." -#~ msgstr "Datoteke ni bilo moč najti." #~ msgid "Cannot open preferences directory: {0}" @@ -27224,4 +27699,28 @@ #~ msgstr "Spori pri zlivanju" +#~ msgid "No images with readable timestamps found." +#~ msgstr "Ni moč najti slik z berljivo časovno oznako." + +#~ msgid "GPS start: {0}" +#~ msgstr "Začetek GPS sledi: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "trenutna razlika: {0}s" + +#~ msgid "GPS end: {0}" +#~ msgstr "Konec GPS sledi: {0}" + +#~ msgid "timezone difference: " +#~ msgstr "razlika časovnih pasov: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} znotraj sledi." + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Vpisanega časa ni bilo mogoče razpoznati." + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)" + #~ msgid "unnamed" #~ msgstr "neimenovano" @@ -27274,4 +27773,7 @@ #~ msgid "Validate" #~ msgstr "Preveri" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - slike z geografskim položajem" #~ msgid "Unknown version" @@ -27287,4 +27789,7 @@ #~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno " #~ "sprejeti." + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Uskladite čas z GPS napravo" #~ msgid "Upload to OSM..." Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 19198) +++ /applications/editors/josm/i18n/po/sv.po (revision 19199) @@ -4,9 +4,10 @@ # FIRST AUTHOR , 2006. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" "PO-Revision-Date: 2009-11-17 18:09+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Skapar huvudgränssnittet" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hjälp" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Hoppar över felaktig URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Varning" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Hoppar över felaktig URL till en fil: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Kunde inte läsa filen ''{0}''.
Felet är:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Kunde inte läsa filen ''{0}''.
Felet är:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "Om JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -279,5 +281,5 @@ "sidorna kommer antagligen inte att fungera. API URL:en är \"{0}\"." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -288,5 +290,5 @@ "antagligen inte att fungera. API URL:en är \"{0}\"." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -295,15 +297,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Fortsätt" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -312,29 +319,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -351,5 +359,9 @@ msgstr "Avbryt" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Välj åtminstonde en redan upladdad nod, väg eller relation" @@ -365,5 +377,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Sammanfoga" @@ -383,15 +395,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Lägg till nod..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Lägg till en nod genom att ange latitud och longitud." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -407,22 +419,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Redigera: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Ange den nya nodens koordinater." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Använd decimalgrader." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negativa värden avser västra/södra halvklotet." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -431,5 +443,5 @@ msgstr "Latitud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -438,28 +450,29 @@ msgstr "Longitud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -471,9 +484,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -494,18 +507,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -517,5 +530,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -537,6 +550,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -583,5 +596,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" @@ -618,14 +631,15 @@ msgstr "Det finns inte några konflikter att zooma till" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Avsluta påbörjade changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Avslutar påbörjade changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -635,21 +649,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Arkiv: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Inga changesets är påbörjade" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Inga påbörjade changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Laddar ner påbörjade changesets..." @@ -736,11 +750,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -819,16 +834,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -864,5 +884,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplicera" @@ -905,10 +925,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Exportera till GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Exportera data till en GPX-fil" @@ -923,12 +943,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -953,8 +973,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -965,10 +985,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -981,17 +1001,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1028,22 +1048,27 @@ msgstr "Visa objektinformation om OSM noder, vägar eller relationer." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Förena överlappande ytor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Förena ytor som överlappar varandra" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Välj åtminstone en sluten väg som skall förenas." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "För närvarande kan enbart upp till två ytor förenas." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" är inte sluten, och kan därför inte förenas med andra ytor." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1057,38 +1082,34 @@ "Är du säker på att du vill fortsätta?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Avbryt om du är osäker" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Välj åtminstone en sluten väg som skall förenas." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "La till nod vid alla korsande sträckor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Ta bort sträckor som inte är del av en inre multipolygon" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Korrigera relationer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Slog ihop område som låg ovanpå sig själv" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Slog ihop områden som låg ovanpå varandra" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1098,33 +1119,33 @@ "att det inte har uppstått några fel." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Ange värden för alla konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Jämka konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Korrigera taggkonflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Tog bort element från relation" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Slå ihop områden: Ta bort korta sträckor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Sluten sträcka" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Ta bort taggar från inre sträckor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1288,5 +1309,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kan inte flytta objekt utanför världen." @@ -1366,28 +1387,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Räta upp form" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1396,9 +1417,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1410,16 +1431,16 @@ "denna varning.
Vill du fortsätta?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Räta upp" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Användning" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Räta upp" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1494,18 +1515,18 @@ msgstr "Kunde inte döpa om filen ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Ändra riktning på sträckor" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Ändra riktningen på alla valda sträckor." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Välj åtminstone en sträcka." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Ändra riktning på sträckor" @@ -1514,10 +1535,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Spara" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Spara nuvarande data." @@ -1574,10 +1595,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Spara som..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Spara nuvarande data i en ny fil." @@ -1621,6 +1642,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1655,5 +1675,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1718,5 +1738,5 @@ "sträckan.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1724,5 +1744,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1730,5 +1750,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1762,34 +1782,34 @@ msgstr "Denna nod är inte bunden till något annat." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Ingen av dessa noder hänger ihop med någonting annat." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Ingen av noderna på denna sträcka är knuten till något annat." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Det nuvarande urvalet kan inte användas för att frigöra något." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Välj antingen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* En nod med tagg, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* En nod som används av mer än en sträcka, eller" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* En nod som används av mer än en sträcka samt en av dessa sträckor, eller" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* En nod som används av mer än en sträcka samt en av dessa sträckor, eller" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1798,5 +1818,5 @@ "eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1805,5 +1825,5 @@ "sträcka." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1818,9 +1838,9 @@ "få sina egna kopior och alla noder kommer att vara valda." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Frigjord nod" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1828,5 +1848,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1861,10 +1881,10 @@ msgstr "Avmarkera allt (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Uppdatera data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1872,53 +1892,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Inget dataset kunde hittas" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Uppdatera markering" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Tom markering" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1927,5 +1943,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1933,136 +1949,7 @@ msgstr "Det finns inte några ändringar att skicka in." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Det finns inte någonting att skicka in. Skaffa lite data först." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synkronisera hela datasetet" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Uppladdning misslyckadesav någon av dina noder, vägar eller relationer.

Klicka på " -"{0} för att synkronisera all lokal data med servern." -"
Klicka på {1} för att avbryta och fortsätta redigera." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Uppdaterar primitiv" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2197,9 +2084,9 @@ msgstr "Hämtade GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Hämtar data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2207,5 +2094,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2281,7 +2168,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2298,58 +2185,52 @@ "noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Rita" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Rita noder" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "markerad" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Det går inte att lägga till en nod utanför världen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Lägg till nod" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Lägg till en nod till sträckan" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Knyt en existerande nod till en sträcka" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Lägg till en ny nod i en befintlig sträcka" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Lägg till en nod i en sträcka och bind ihop" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Skapa ny nod" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Markera nod under pekare." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2358,14 +2239,14 @@ msgstr[1] "Infoga ny nod i {0} vägar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Starta ny väg från senaste nod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Fortsätt väg från senaste nod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Avsluta ritning." @@ -2406,18 +2287,19 @@ "därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Markera" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Välj, flytta och rotera objekt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2426,17 +2308,17 @@ msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Flytta element" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Flytta" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Ångra flytt" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2446,13 +2328,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Släpp musknappen för att välja objekten i rektangeln." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2461,9 +2343,9 @@ "nod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Släpp musknappen för att sluta rotera." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2475,5 +2357,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zooma:" @@ -2497,5 +2379,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Sök efter objekt." @@ -2589,7 +2471,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - alla objekt som ändrats av användare..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2598,8 +2479,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - objekt med givent antal noder" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:... - objekt med givent antal noder" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2607,35 +2498,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - alla ändrade objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - alla valda objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - alla ofullständiga objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "otaggade - alla otaggede objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Använd | eller OR för att kombinera med logiskt ELLER" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2643,11 +2540,11 @@ "innehåller :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Använd ( och ) för att gruppera uttryck" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2655,55 +2552,55 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Sök" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Påbörja sökning" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Inga sökträffar för ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Urvalet utökades inte genom att söka efter ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Urvalet begränsades inte genom att söka efter ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "{0} sökträffar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2717,40 +2614,43 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Det saknas argument för eller (or)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Det saknas argument för inte (not)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "En avslutande parentes förväntades" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Det saknas argument för eller (or)." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2759,9 +2659,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Felaktigt antal parametrar för nodoperator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2770,7 +2670,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2804,44 +2709,30 @@ msgstr "Fel under kommunikation med servern." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Antal ändringar överskrider det maximala antalet ändringar, antal ändringar " -"är {0}, max är {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" +"{0} noder i väg {1} överskrider det maximala antalet tillåtna noder {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Bryter mot API:ns möjligheter" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"VARNING: trunkerar automatiskt värde för tagg \"{0}\" på borttagen primitiv " -"{1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"Längd på värde för tagg \"{0}\" på primitiv {1} överskrider det max. " -"tillåtna längden ({2}). Värdets längd är {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"{0} noder i väg {1} överskrider det maximala antalet tillåtna noder {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2953,5 +2844,5 @@ msgstr "Sätt {0}={1} för {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2966,5 +2857,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -3065,4 +2956,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3174,5 +3080,5 @@ msgstr "Tillämpa?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3256,15 +3162,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "Fel i konfigurationsfilen på raderna {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3273,5 +3179,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3280,5 +3186,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3287,5 +3193,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3294,5 +3200,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3300,5 +3206,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3307,5 +3213,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3314,5 +3220,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3321,5 +3227,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3328,10 +3234,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3339,24 +3245,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Inställningar lagrade på {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Kunde inte skicka in inställningar. Orsak: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Kunde inte hämta inställningar från server." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3365,5 +3271,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3392,5 +3298,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3412,31 +3318,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "V" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "Ö" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3444,5 +3343,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3453,27 +3352,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3481,5 +3380,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3491,5 +3390,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3497,25 +3396,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3523,43 +3422,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Parameter {0} > 0 krävs. Erhöll {1}." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3567,5 +3478,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3593,10 +3504,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3604,7 +3511,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3619,5 +3526,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3635,146 +3542,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "En sträcka för en yta är inte sluten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Multipolygonsträckan ''{0}'' är inte sluten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Tog bort medlemmen ''{0}'' i relationen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Sträcka \"{0} med mindre än två punkter." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Det finns mer än en \"från\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Det finns mer än en \"till\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Mer än en \"via\" hittades." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Okänd roll ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Okänd medlemstyp för ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Det finns inte någon \"från\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Det finns inte någon \"till\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Ingen nod eller sträcka för \"via\" hittades." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Stil för restriktion {0} kunde inte hittas." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Den inre sträckan ''{0}'' befinner sig utanför." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Icke-sträcka ''{0}'' i multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygonen ''{0}'' saknar yttre sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Stil för yttre väg ''{0}'' passar inte." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "otaggade" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Fel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Varning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "inaktiv" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "markerad" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3783,6 +3682,6 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3791,7 +3690,8 @@ msgstr[1] "sträckor" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3800,21 +3700,37 @@ msgstr[1] "relationer" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "otaggade sträcka" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "ofullständig sträcka" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "bakgrund" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "framhäv" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "otaggade" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "text" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3956,5 +3872,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "järnväg" @@ -3970,7 +3886,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3986,4 +3902,10 @@ msgstr[1] "{0} medlemmar" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4015,6 +3937,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Konflikt" @@ -4028,7 +3950,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4113,74 +4035,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Användarnamn" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Lösenord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "användning" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "alternativ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Visa denna hjälptext" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Standard unix-geometri-argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Hämta hem området inom gränsvärdena" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Öppna fil (som rå gps, om .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Hämta området innanför gränsvärden som rå gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Gör urval med angivet sökkriterium" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Öppna i maximerat läge" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Återställ inställningarna till förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Ange språk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4189,9 +4111,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "exempel" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4201,36 +4123,36 @@ "data innan --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Istället för --download= kan du använda osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktiverar uppdaterade insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Hämtar tidiga insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Anger förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Hämtar insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Arkiv" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4245,22 +4167,22 @@ msgstr "Redigera" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Visa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Verktyg" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Snabbval" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4268,5 +4190,5 @@ msgstr "Meny: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Ljud" @@ -4345,13 +4267,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "lagret finns inte i listan." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4384,5 +4307,5 @@ msgstr "Initierar" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4390,6 +4313,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4398,5 +4321,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4405,5 +4328,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4412,25 +4335,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4438,9 +4361,9 @@ msgstr "Roll" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4472,11 +4395,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4485,6 +4408,6 @@ msgstr "Taggar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4492,6 +4415,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4499,40 +4422,40 @@ msgstr "Medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4540,21 +4463,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4586,22 +4509,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4609,5 +4532,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4615,30 +4538,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4646,5 +4569,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4652,14 +4575,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4667,5 +4590,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4673,23 +4596,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4700,27 +4623,27 @@ msgstr "Ta bort" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4729,5 +4652,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4736,5 +4659,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4743,5 +4666,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4750,5 +4673,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4757,5 +4680,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4765,5 +4688,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5000,10 +4923,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5013,10 +4936,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5101,9 +5024,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5111,6 +5034,6 @@ msgstr "inget" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "alla" @@ -5199,7 +5122,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5209,6 +5132,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5316,4 +5239,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Ta bort valda objekt." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Ändra värden?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Hämta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Hämta kartdata från OSM-servern." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Avslutar påbörjade changesets" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Öppna en redigerare för den valda relationen" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5327,12 +5302,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5350,19 +5325,19 @@ msgstr "Kommandolista: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Jämka" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" "Öppna en sammanfogningsdialog med alla de valda posterna från listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5370,25 +5345,25 @@ msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5400,26 +5375,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5430,41 +5405,41 @@ msgstr "Lägg till" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5503,5 +5478,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5516,34 +5491,34 @@ msgstr "Öppna en lista av alla inlästa lager." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Ta bort valt lager." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Visa/Dölj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Alternera visning av det valda lagret." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Flytta det valda lagret en rad upp." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Flytta det valda lagret en rad ner." @@ -5553,5 +5528,177 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Öppna en lista över alla relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relationer: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Öppna en redigerare för den valda relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Ta bort den valda relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Skapa en ny relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Aktuellt urval" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Öppna en urvalslista" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Zooma till valda objekt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Zooma till urval" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Urval: Rel.:{0}/Sträckor:{1}/Noder:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Markering" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Urval: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Lossa panelen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Stäng denna panel. Du kan öppna den igen med hjälp av knapparna i den " +"vänstra verktygraden." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Klicka för att minimera/maximera panelens innehåll" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Upphovsmän" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Öppna en lista över de som arbetar med de valda objekten." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Upphovsman" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# objekt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "ofullständig" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "slutenväg" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Laddar ner påbörjade changesets..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5560,22 +5707,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Ändra värden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5584,5 +5731,5 @@ msgstr[1] "Ändra egenskaper för upp till {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5591,228 +5738,71 @@ msgstr[1] "Detta kommer att ändra upp till {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Välj en nyckel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Välj ett värde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Välj de objekt vars egenskaper du vill ändra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Egenskaper/Roller" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Egenskaper för valda objekt." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Lägg till egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Egenskaper / Roller" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Ändra relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Ta bort från relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Verkligen ta bort det valda från relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Ta bort den valda nyckeln från alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Ta bort egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Redigera värdet av den valda nyckeln för alla objekt." - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relationer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Öppna en lista över alla relationer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relationer: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Öppna en redigerare för den valda relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Ta bort den valda relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Skapa en ny relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Aktuellt urval" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Öppna en urvalslista" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Zooma till valda objekt" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Zooma till urval" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Urval: Rel.:{0}/Sträckor:{1}/Noder:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Markering" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Urval: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Lossa panelen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Stäng denna panel. Du kan öppna den igen med hjälp av knapparna i den " -"vänstra verktygraden." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Klicka för att minimera/maximera panelens innehåll" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Upphovsmän" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Öppna en lista över de som arbetar med de valda objekten." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Upphovsman" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# objekt" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5874,14 +5864,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Hämta alla ofullständiga sträckor och noder i relationen" -msgstr[1] "Hämta alla ofullständiga sträckor och noder i relationen" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Hämta plats" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5904,14 +5893,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Tillämpa snabbval" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Öppna en redigerare för den valda relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5920,14 +5907,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5937,9 +5924,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5949,15 +5936,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5965,5 +5952,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5971,20 +5958,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5993,70 +5980,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Sport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6065,9 +6051,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6076,48 +6062,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Hämta alla ofullständiga sträckor och noder i relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Hämta medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6127,34 +6112,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6266,10 +6251,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6279,5 +6264,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6363,9 +6348,4 @@ msgid "Download Area" msgstr "Hämta område" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Hämta" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6665,6 +6645,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6677,6 +6655,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6947,4 +6923,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7167,5 +7147,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7208,116 +7188,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Namn" @@ -7341,15 +7321,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7520,10 +7500,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7531,5 +7511,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7537,9 +7517,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7654,6 +7634,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "okänd" @@ -7675,13 +7655,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7716,4 +7696,121 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synkronisera hela datasetet" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Uppladdning misslyckadesav någon av dina noder, vägar eller relationer.

Klicka på " +"{0} för att synkronisera all lokal data med servern." +"
Klicka på {1} för att avbryta och fortsätta redigera." +"
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Ge en kort kommentar till de ändringar som du skickar in:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7732,39 +7829,147 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Skicka in ändringar" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Stänger ändringssamling..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Spara användare och lösenord (okrypterat)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Ange ett användarnamn" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Varning: Lösenordet skickas okrypterat." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Friidrott" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Ändra relation" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7831,17 +8036,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7854,9 +8059,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7870,9 +8075,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7887,50 +8092,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Kassera och avsluta" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7938,5 +8143,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -8009,40 +8214,374 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Inställningar" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "Advanced" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Ställ in tillgängliga insticksmoduler." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Okänd roll ''{0}''." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Skicka in ändringar" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Om" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Välj vilken rad du vill ta bort." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Nya objekt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Ändrade objekt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Borttagna objekt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8051,5 +8590,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8058,5 +8597,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8065,208 +8604,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Skicka in ändringar" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Ange först önskade koordinater." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Ge en kort kommentar till de ändringar som du skickar in:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} meter" -msgstr[1] "{0} meter" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Ange ett användarnamn" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps-punkt" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Anpassa linjeritning" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Använd globala inställningar" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Rita linjer mellan punkter i detta lager." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Rita inte linjer mellan punkter i detta lager." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Välj alternativ för linjeritning" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8274,5 +8642,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8281,5 +8649,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8361,5 +8729,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Beskrivning" @@ -8391,10 +8759,10 @@ msgstr[1] "{0} sträckpunkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Omvandla till datalager" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8404,12 +8772,12 @@ "skicka in spår, se här:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8418,29 +8786,29 @@ msgstr "Omvandlad från:{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Hämta från OSM längs med detta spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Hämta allting inom:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Största tillåtna område per begäran:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8451,9 +8819,9 @@ "Önskar du
fortsätta?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8463,5 +8831,5 @@ "än dess slut uteslöts eller flyttades till början." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8471,23 +8839,23 @@ "kunna uppskattas med någon rimlighet uteslöts." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datalager {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "utanför hämtat område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8496,5 +8864,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8508,5 +8876,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8519,11 +8887,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8532,36 +8900,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Omvandla till gpx-lager" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8569,5 +8937,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8576,5 +8944,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8582,5 +8950,5 @@ msgstr[1] "punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8589,5 +8957,5 @@ msgstr[1] "ett spår med {0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8596,5 +8964,5 @@ msgstr[1] "{0} består av {1} spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8603,24 +8971,24 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX-filer" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Filen {0} är fortfarande aktiv under namnet \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Fel vid tolkning {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Kunde inte öppna \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8632,34 +9000,34 @@ "välj en tidzon

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Fototid (från exif):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Gps-tid (läst från fotot ovan): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Jag är i följande tidzon: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Inget datum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Öppna ett annat foto" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synkronisera tid med hjälp av ett foto av GPS-mottagaren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8669,71 +9037,157 @@ "Använd begärt format" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Ogiltigt datum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX-spår: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Öppna ett annat foto" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Auto-gissa" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Uppdatera position för: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Tidszon: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Förskjutning:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Jag kan ta en bild av min GPS-mottagare.
Kan detta vara till nytta?" -"" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Uppdatera position för: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alla bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Bilder utan positionsangivelse i exif" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Bilder som inte taggats ännu" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Inget markerat!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Parade ihop {0} av {1} foton med GPX-spåret" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Sätt bilder i relation till GPX-spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Korrelera" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-gissa" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Ogiltig tidszon" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Ogiltig förskjutning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Spårar" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Tidszon: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Minuter: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekunder: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Tidsdifferens om {0} dagar)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "Matchning av fotografier mot spår misslyckades" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Justera tidszon och tidsförskjutning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "De markerade fotografierna innehåller ingen tidsinformation." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Fotografierna innehåller ingen tidsinformation." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX-spåret saknar tidsinformation" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "Välj ett GPX-spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "Inget GPX-spår har valts" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8744,9 +9198,5 @@ "Förväntat format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Ogiltig tidszon" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8757,135 +9207,56 @@ "Förväntat format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Ogiltig förskjutning" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Hittade {0} träffar för {1} i GPX-spår {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX-spår har hämtats" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "De markerade fotografierna innehåller ingen tidsinformation." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Fotografierna innehåller ingen tidsinformation." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX-spåret saknar tidsinformation" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Tidszon: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minuter: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekunder: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Parade ihop {0} av {1} foton med GPX-spåret" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Tidsdifferens om {0} dagar)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Förskjutning mellan spår och foton: {0}m {1}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Matchning av fotografier mot spår misslyckades" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Justera tidszon och tidsförskjutning" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standardinställningar" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Extraherar GPS-plats från EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Påbörjar foldergenomläsning" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Läs in foton..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Läser {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Läser igenom folder {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Fel vid läsning av filer från folder {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Geotaggade bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Korrelerar med GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8893,52 +9264,99 @@ msgstr[1] "bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} hittades med gps-taggar." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Filen kunde inte hittas." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Ingen bild" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Hämtar {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Fel i fil {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Visa geotaggade foton" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Föregående" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Föregående bild" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Växla: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Ta bort foto från lagret" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Ta bort från relation" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Nästa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Nästa bild" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Centrera visning" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8949,5 +9367,5 @@ "Höjd: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9048,4 +9466,12 @@ msgid "Error displaying URL" msgstr "Fel vid visning av URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9272,7 +9698,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Alla" @@ -9341,6 +9766,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Cykel" @@ -9740,31 +10165,91 @@ msgstr "Projektionen {0} kunde inte aktiveras. Använder Merkator" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Aktivera proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonym" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Vandrarhem" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Port:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Lösenord" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Proxyinställningar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Värd för proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Port för proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Användarnamn för proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Lösenord för proxyserver" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "Bas-URL för OSM-servern (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Bas-URL för servern" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM-lösenord" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10072,5 +10557,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10080,13 +10565,13 @@ msgstr[1] "Ta bort gamla nycklar för upp till {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10094,18 +10579,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Valfria attribut:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "slutenväg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Okänd typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10116,16 +10601,16 @@ msgstr "Kunde inte läsa källan till snabbval för taggning: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Fel vid tolkning {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Objekt av typ {0} stöds." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10134,18 +10619,18 @@ msgstr[1] "Ändra {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Inget markerat!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Urvalet passar inte!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Tillämpa snabbval" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Ändra egenskaper" @@ -10174,4 +10659,11 @@ msgstr "Hämtar punkter {0} till {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10187,12 +10679,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, Det saknas förmodligen några taggar." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Förbereder data..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10295,16 +10842,16 @@ msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10314,40 +10861,40 @@ msgstr "Hämtar OSM-data..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10355,10 +10902,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Hämtar punkter {0} till {1}..." -msgstr[1] "Hämtar punkter {0} till {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10395,14 +10942,14 @@ msgstr "Import från NMEA misslyckades!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10411,16 +10958,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10428,66 +10975,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Stänger ändringssamling..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Förbereder..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Skickar in..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Förbereder data..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Ändra {0} objekt" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10513,4 +11071,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10522,5 +11090,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10547,5 +11115,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10553,5 +11121,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10564,5 +11132,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10573,58 +11141,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Felaktigt lösenord eller användarnamn." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Varning: Lösenordet skickas okrypterat." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Spara användare och lösenord (okrypterat)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Ange lösenord" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Logga in" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "Bas-URL för OSM-servern (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Bas-URL för servern" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM-lösenord" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10714,5 +11230,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10721,38 +11244,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10760,19 +11283,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Ofullständig -specifikation med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Ogiltigt objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10782,8 +11305,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10793,25 +11316,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10819,5 +11358,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10826,5 +11365,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10832,5 +11371,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10839,13 +11378,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Förbereder OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10868,21 +11407,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Laddar ner påbörjade changesets..." +msgstr[1] "Laddar ner påbörjade changesets..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Laddar ner påbörjade changesets..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10910,9 +11461,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10972,5 +11519,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10980,4 +11527,9 @@ msgid "Uploading data ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Raderade eller flyttade primitiv" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11020,12 +11572,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Ta bort {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Fel vid borttagande av fil för insticksmodulen: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11172,9 +11724,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "ingen beskrivning tillgänglig" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11306,4 +11858,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Parameter {0} > 0 krävs. Erhöll {1}." + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11598,6 +12165,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Skicka in spår" @@ -11683,5 +12250,5 @@ msgstr "Skickar in GPX-spår" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Skickar in spår till openstreetmap.org" @@ -11692,5 +12259,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Adressinterpolation" @@ -11705,11 +12272,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Udda" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Jämna" @@ -11720,24 +12284,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Nummer" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "naturfenomen" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "bild" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Uthyrning" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11755,7 +12315,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "inre segment" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11868,5 +12427,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11928,21 +12487,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Välj commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Välj en av..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Automatkälla" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11951,13 +12510,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11982,17 +12541,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Aktivera automatisk cachning." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Största tillåtna cachestorlek (MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12004,9 +12563,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "Fransk Cadastre-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -12014,10 +12573,10 @@ "källa är aktiverat." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Källa" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12027,5 +12586,5 @@ "JOSM:s inställningar." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12035,52 +12594,49 @@ "gråtoner). Användbart för text på mörka bakgrunder." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Rita en rektangel runt data nedladdad från WMS-servern." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hämta mindre bilder (högre kvalitet, men mer minneskrävande)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Äldsta filerna raderas automatiskt när denna storlek överskrids" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Tagg för källa har automatiskt lagts till:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Lägg \"source=...\" till objekt?" @@ -12282,5 +12838,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Plats" @@ -12473,5 +13029,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Ingen data har lästs in." @@ -12493,9 +13049,9 @@ msgstr "Konvertera till GPX-lager med anonymiserad tid" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "redigera GPX-spår" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "RedigeraGpx" @@ -12884,7 +13440,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "vatten" @@ -13044,19 +13600,19 @@ msgstr "Kunde inte skaffa en bild" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Ansluter" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Ansluten" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Inte ansluten" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Anslutning misslyckades" @@ -13095,33 +13651,33 @@ msgstr "LiveGPS-lager" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Fånga GPS-spår" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" "Anslut till en gpsd-server och visa nuvarande position i ett LiveGPS-lager." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Centrera en gång" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Centrera LiveGPS-lagret runt nuvarande position." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Autocentrera" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Centrera kontinuerligt LiveGPS-lagret runt nuvarande position." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13172,9 +13728,9 @@ msgstr "Det går inte att rita utanför världen." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "mätläge" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Mätningar" @@ -13212,5 +13768,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13221,13 +13777,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13375,5 +13931,5 @@ msgstr "Firefox-applikationen" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13468,5 +14024,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13542,41 +14098,41 @@ msgstr "Ange viktvärden" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Glidande karta" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Hämta ruta" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Hämta alla rutor" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Öka zoomläge" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Minska zoomläge" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13750,4 +14306,43 @@ "Du måste först ange källor för snabbval för taggning i inställningarna." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Jämna" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Lägst nummer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Högst nummer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Vägar" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Högst nummer" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13766,42 +14361,20 @@ msgstr "Vänd husrad" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Gör radhus av husrad" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Skapar enskilda byggnader från en lång byggnad." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Markera en enda, stängd väg med minst fyra noder." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Husrad" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Högst nummer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Lägst nummer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolering" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Gatunamn" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Valfri" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13816,5 +14389,5 @@ msgstr "Inga valideringsfel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Rutnät" @@ -14479,38 +15052,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "byggnad (building)" @@ -14524,5 +15067,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "yta (area)" @@ -14645,10 +15188,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15349,6 +15892,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Referens" @@ -15794,5 +16337,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Bredd (meter)" @@ -15910,5 +16453,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15920,5 +16463,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "skog" @@ -16176,4 +16719,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16205,8 +16751,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "ja" @@ -16354,9 +16902,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "nej" @@ -16601,5 +17150,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "bostadsgata" @@ -16634,5 +17183,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "tillfartsväg" @@ -16666,6 +17215,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "under byggnad" @@ -16715,5 +17264,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "rondell" @@ -16901,6 +17450,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Vandringsled" @@ -17021,5 +17570,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17045,4 +17593,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17052,15 +17601,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operatör" @@ -17272,7 +17821,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Höjd" @@ -17691,5 +18240,5 @@ msgstr "mosse" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17699,5 +18248,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "kärr" @@ -18223,32 +18772,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Öppettider" @@ -18307,91 +18856,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18406,5 +18955,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18423,7 +18972,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Referensnummer" @@ -18439,5 +18988,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "underjordisk" @@ -18450,6 +18999,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Avgift" @@ -18488,22 +19037,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Affär" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Redigera bilförsäljare" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Bilverkstad" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Redigera en bilverkstad" @@ -18511,5 +19048,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Uthyrning" @@ -18518,10 +19055,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Redigera biluthyrning" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Bilpool" @@ -18529,5 +19066,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Redigera bilpool" @@ -18535,10 +19072,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Redigera en cykelparkering" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Kapacitet" @@ -18547,22 +19084,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Redigera en cykeluthyrning" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Redigera cykelaffär" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Kollektivtrafik" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18572,5 +19102,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18578,5 +19108,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-klassificering" @@ -18584,5 +19114,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Järnvägshållplats" @@ -18590,5 +19120,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Redigera hållplats" @@ -18596,5 +19126,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Spårvagnshållplats" @@ -18603,5 +19133,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Redigera spårvagnshållplats" @@ -18609,5 +19139,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Plattform" @@ -18616,5 +19146,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Redigera plattform" @@ -18626,5 +19156,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Referens (spårnummer)" @@ -18632,10 +19162,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Område" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Tunnelbaneingång" @@ -18644,10 +19174,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Redigera tunnelbaneingång" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Rullstol" @@ -18656,5 +19186,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Bussterminal" @@ -18663,5 +19193,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Redigera en bussterminal" @@ -18669,5 +19199,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Busshållplats" @@ -18677,5 +19207,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Redigera en busshållplats" @@ -18684,17 +19214,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "VIndskydd" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Bänk" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Bussplattform" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Redigera en bussplattform" @@ -18702,5 +19240,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -18708,5 +19246,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Redigera en taxistation" @@ -18714,5 +19252,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Flygplats" @@ -18720,15 +19258,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18736,10 +19274,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Logi" @@ -18751,5 +19289,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotell" @@ -18758,15 +19296,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Redigera ett hotell" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Stjärnor" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motell" @@ -18774,20 +19312,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Redigera ett motell" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Pensionat" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Redigera pensionat" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Fäbod" @@ -18795,10 +19333,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Redigera fäbod" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Vandrarhem" @@ -18806,30 +19344,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Redigera ett vandrarhem" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Alphydda" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Redigera alphydda" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Husvagnscamping" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Redigera en husvagnscamping" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Campingplats" @@ -18837,10 +19375,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Redigera en campingplats" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Mat+Dryck" @@ -18851,5 +19389,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurang" @@ -18857,5 +19395,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Redigera en restaurang" @@ -18863,5 +19401,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Kök" @@ -18869,61 +19407,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italienskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "kinesiskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamburgare" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "grekiskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "tyskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indiskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "lokalt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turkiskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asiatiskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thailändskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexikanskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japanskt" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Snabbmat" @@ -18931,9 +19469,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Redigera en snabbmatsrestaurang" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Kafé" @@ -18941,9 +19479,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Redigera kafé" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pub" @@ -18951,18 +19489,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Redigera pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Redigera Biergarten" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "" @@ -18970,9 +19508,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Nattklubb" @@ -18980,24 +19518,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Redigera nattklubb" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turism" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Sevärdhet" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Redigera sevärdhet" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museum" @@ -19005,9 +19543,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Redigera museum" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -19016,9 +19554,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Redigera zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Utsiktsplats" @@ -19026,24 +19564,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Redigera utsiktsplats" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Utsiktstorn" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Nöjespark" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Redigera en nöjespark" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Konst" @@ -19051,5 +19589,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Redigera konstverk" @@ -19057,19 +19595,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Karta" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -19107,5 +19645,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19113,28 +19651,28 @@ msgstr "gata" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -19144,5 +19682,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -19150,6 +19688,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Cykling" @@ -19157,5 +19695,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19163,6 +19701,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Skidåkning" @@ -19170,5 +19708,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19176,46 +19714,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "historiskt" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "naturfenomen" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "djurliv" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19223,29 +19761,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "Redigera vindskydd" @@ -19253,25 +19791,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Eldstad" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Picknickplats" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Redigera picknickplats" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Historiska platser" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Slott" @@ -19280,19 +19818,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Redigera slott" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruiner" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Redigera ruiner" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Utgrävningsplats" @@ -19301,9 +19839,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Redigera utgrävningsplats" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Krigsskådeplats" @@ -19311,10 +19849,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Redigera krigsskådeplats" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19322,5 +19860,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19328,15 +19866,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monument" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Redigera monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Minnesmärke" @@ -19344,55 +19882,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Redigera minnesmärke" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Vägkors" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Redigera ett vägkors" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Vägaltare" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Redigera ett vägaltare" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Nöje" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Badanläggning" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Redigera badanläggning" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Lekplats" @@ -19400,35 +19938,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Redigera lekplats" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Fiske" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Redigera fiske" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Sportfaciliteteter" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Redigera stadion" @@ -19442,6 +19980,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "välj sport:" @@ -19833,30 +20371,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "sport" @@ -19866,225 +20404,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "flera" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "bågskytte" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "friidrott" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "australisk fotboll" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "boule" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "kanot" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "klättring" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "kricket_nät" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "krocket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "cykling" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "hundracing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "ridsport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "amerikansk fotboll" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gymnastik" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "ishockey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "hästkapplöpning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "motorsport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "rackets" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "skytte" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "skridskoåkning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "skidåkning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "fotboll" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "simning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "bordtennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Sporthall" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Redigera sporthall" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Plan" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Redigera plan" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Bana" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Redigera bana" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfbana" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Redigera golfbana" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Redigera minigolfbana" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Flera" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Redigera flersportsfacilitet" @@ -20123,21 +20661,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "typ" @@ -20176,203 +20714,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "plan" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "sporthall" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Friidrott" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Redigera friidrott" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Bågskytte" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Redigera bågskytte" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Klättring" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Redigera klättring" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Kanotpaddling" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Redigera kanotpaddling" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Redigera cykling" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Hundkapplöpning" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Redigera hundkapplöpning" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Ridsport" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Redigera ridsport" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Hästkapplöpning" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Redigera hästkapplöpning" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gymnastik" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Redigera gymnastik" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Motorsport" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Redigera motorsport" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Skridskoåkning" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Redigera skridskoåkning" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Redigera skateboard" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Simning" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Redigera simning" @@ -20380,56 +20918,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Redigera skidåkning" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Skidspårstyp" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "utförsåkning" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "längdskidåkning" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Svårighetsgrad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "nybörjare" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "lätt" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "expert" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "ospårat" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Skytte" @@ -20437,182 +20975,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Redigera skytte" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Bollsport" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Fotboll" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Redigera fotboll" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Amerikansk fotboll" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Redigera amerikansk fotboll" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Australisk fotboll" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Redigera australisk fotboll" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Redigera baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basket" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Redigera basket" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Redigera golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golf_bana" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Redigera boule" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Redigera cricket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Cricketnät" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Redigera cricketnät" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Krocket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Redigera krocket" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Ishockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Redigera ishockey" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Redigera pelota" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Rackets" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Redigera rackets" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Redigera rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Bordtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Redigera bordtennis" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Redigera tennis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Byggnader" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Byggnad" @@ -20620,5 +21158,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Offentlig byggnad" @@ -20626,10 +21164,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Redigera offentlig byggnad" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Stadshus" @@ -20637,10 +21175,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Redigera stadshus" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Ambassad" @@ -20648,10 +21186,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Redigera ambassad" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Domstol" @@ -20660,10 +21198,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Redigera domstol" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Fängelse" @@ -20672,10 +21210,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Redigera fängelse" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Polisstation" @@ -20685,10 +21223,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Redigera polisstation" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Brandstation" @@ -20697,10 +21235,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Redigera brandstation" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Postkontor" @@ -20708,5 +21246,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Redigera postkontor" @@ -20714,15 +21252,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Barndaghem" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Redigera barndaghem" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Skola" @@ -20730,10 +21268,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Redigera skola" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Högskola/universitet" @@ -20741,10 +21279,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Redigera högskola/universitet" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Högskola" @@ -20752,5 +21290,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Redigera högskola" @@ -20758,5 +21296,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Biograf" @@ -20765,10 +21303,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Redigera biograf" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Bibliotek" @@ -20777,9 +21315,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Redigera bibliotek" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Konstcenter" @@ -20787,10 +21325,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Redigera konstcenter" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Teater" @@ -20799,10 +21337,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Redigera teater" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Religiös helgedom" @@ -20812,5 +21350,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Redigera religiös helgedom" @@ -20819,6 +21357,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religion" @@ -20827,66 +21365,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "buddism" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "kristendom" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hinduism" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "judendom" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "islam" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "daoism" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrianism" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Samfund" @@ -20895,81 +21433,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglikaner" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptister" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "katoliker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangelister" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "jehovas_vittnen" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "luteraner (inkl. Svenska kyrkan)" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "metodister" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormoner" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "ortodoxa" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pinstvänner" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbytarianer" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestanter" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "kväkare" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "shiamuslimer" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunnimuslimer" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adresser" @@ -20978,5 +21516,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Redigera adressinformation" @@ -20984,5 +21522,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Husnummer" @@ -20990,20 +21528,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Husnamn" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Gatunamn" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Stadsnamn" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Postnummer" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Landskod" @@ -21012,5 +21555,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Redigera adressinterpolation" @@ -21018,61 +21561,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Numreringsschema" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "udda" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "jämn" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Byggnadsverk" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Fabrik" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Redigera fabriksbyggnad" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Torn" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Redigera torn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -21080,25 +21623,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Vattentorn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Redigera vattentorn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gasklocka" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Redigera gasklocka" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Fyrtorn" @@ -21106,10 +21649,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Fyrtorn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Väderkvarn" @@ -21117,10 +21660,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Redigera väderkvarn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Rörledning" @@ -21129,37 +21672,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Redigera rörledning" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "naturgas" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Reningsverk" @@ -21169,10 +21712,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Redigera reningsverk" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Kran" @@ -21180,10 +21723,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Redigera kran" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Fyrbåk" @@ -21191,10 +21734,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Redigera fyrbåk" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Mätpunkt" @@ -21202,10 +21745,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Redigera mätpunkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Övervakning" @@ -21213,5 +21756,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Redigera övervakningskamera" @@ -21219,5 +21762,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Kraftverk" @@ -21227,35 +21770,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Redigera ett kraftverk" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "vindkraft" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "vattenkraft" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fossila bränslen" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "kärnkraft" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "kolkraft" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "solkraft" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Kraftstation" @@ -21264,10 +21807,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Redigera en kraftstation" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -21276,5 +21819,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Redigera en transformatorstation" @@ -21282,10 +21825,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Kraftledningsmast" @@ -21296,23 +21839,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Redigera en kraftledningsmast" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Kraftledning" @@ -21321,75 +21864,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Redigera en kraftledning" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Spänning" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Inrättningar" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Toaletter" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Anteckning" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Brevlåda" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefon" @@ -21398,5 +21941,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Redigera en telefon" @@ -21404,5 +21947,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Mynt" @@ -21410,5 +21953,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Anteckningar" @@ -21416,5 +21959,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Betalkort" @@ -21422,5 +21965,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Kontokort" @@ -21428,15 +21971,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Återvinning" @@ -21445,5 +21988,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Redigera en återvinningsstation" @@ -21451,68 +21994,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Burkar" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Kläder" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papper" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Metallskrot" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Bänk" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21583,39 +22121,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Jakttorn" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Redigera ett jakttorn" @@ -21624,30 +22162,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Höjd" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "låg" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "halv" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "full" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Dölj" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fontän" @@ -21656,10 +22194,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Redigera en fontän" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Dricksvatten" @@ -21668,10 +22206,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Redigera dricksvattensfacilitet" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21679,33 +22217,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Affärer" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Redigera bilförsäljare" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lakewalker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Redigera cykelaffär" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Stormarknad" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Redigera stormarknad" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Närköp" @@ -21713,9 +22275,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Redigera närköp" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosk" @@ -21723,27 +22285,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Redigera kiosk" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Automat" @@ -21751,5 +22313,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Redigera en automat" @@ -21757,88 +22319,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Varor till försäljning" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "biljetter för allmänna transportmedel" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "parkeringsbiljetter" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "mat" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "dryck" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "godis" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "cigaretter" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "foton" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "djurmat" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "tidningar" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "leksaker" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "frimärken" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "telefonkort" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "hundpåsar" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Slakteri" @@ -21846,9 +22408,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Redigera slakteri" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Bageri" @@ -21856,9 +22418,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Redigera bageri" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Florist" @@ -21866,18 +22428,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Redigera florist" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21885,54 +22447,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Drycker" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Dator" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Redigera datoraffär" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Electronik" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Redigera elektronikaffär" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Redigera hifi-affär" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Möbler" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Redigera möbelaffär" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Trädgårdscenter" @@ -21940,9 +22502,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Redigera trädgårdscenter" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Järnvaror" @@ -21950,9 +22512,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Redigera järnaffär" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Gör-det-själv-affär" @@ -21960,54 +22522,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Redigera gör-det-själv-affär" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Kontorsmaterial" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Redigera pappershandel" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Hårfrisör" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Redigera hårfrisör" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Skor" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Redigera skoaffär" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Leksaker" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Redigera leksaksaffär" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Videobutik" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Redigera videobutik" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Kemtvätt" @@ -22015,9 +22577,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Redigera kemtvätt" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Tvätteri" @@ -22025,9 +22587,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Redigera tvätteri" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Friluftsliv" @@ -22035,28 +22597,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Redigera affär för friluftsliv" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Redigera sportaffär" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Redigera optiker" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Pengar" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Bank" @@ -22064,14 +22626,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Redigera bank" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Uttagsautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Växlingskontor" @@ -22079,5 +22641,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Redigera växlingskontor" @@ -22085,15 +22647,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Redigera uttagsautomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Hälsovård" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Läkare" @@ -22101,18 +22663,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Redigera läkare" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Tandläkare" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Redigera tandläkare" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Apotek" @@ -22120,5 +22682,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Redigera apotek" @@ -22126,9 +22688,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Receptutlämnande" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Sjukhus" @@ -22136,10 +22698,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Redigera sjukhus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -22148,5 +22710,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -22155,20 +22717,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "Använd internationellt format, ex +12-345-67890" @@ -22176,5 +22738,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Veterinär" @@ -22183,64 +22745,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Redigera veterinär" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Platser" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Redigera en kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Redigera land" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Delstat" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Redigera delstat" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Redigera region" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Län" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Redigera län" @@ -22248,15 +22810,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Stad" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Redigera stad" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Småstad" @@ -22264,10 +22826,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Redigera småstad" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Förort" @@ -22275,25 +22837,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Redigera förort" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Mindre tätort" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Redigera mindre tätort" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Småort" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Redigera småort" @@ -22301,5 +22863,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Plats" @@ -22307,10 +22869,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Redigera plats" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Ö" @@ -22318,10 +22880,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Redigera ö" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22329,5 +22891,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22335,5 +22897,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Grottöppning" @@ -22341,10 +22903,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Redigera en grottöppning" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Topp" @@ -22352,10 +22914,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Redigera topp" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Glaciär" @@ -22363,10 +22925,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Redigera en glaciär" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Vulkan" @@ -22374,70 +22936,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Redigera en vulkan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Gränser" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Nationella" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Redigera nationsgränser" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administrativ" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Redigera administrativa gränser" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Civilrättslig" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Redigera en civilrättslig gräns" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Redigera politiska gränser" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Redigera gräns för nationalpark" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Markanvändning" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Träd" @@ -22446,15 +23008,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Redigera ett träd" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botaniskt namn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Naturskog" @@ -22463,5 +23025,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Redigera naturskog" @@ -22469,17 +23031,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "barrskog" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "lövskog" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "blandskog" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Kulturskog" @@ -22488,14 +23050,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Redigera användning av mark för skogsbruk" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Naturreservat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Redigera naturreservat" @@ -22503,25 +23065,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Bergsluttning (med lösa stenar)" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Redigera bergssluttning (med lösa stenar)" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Buskage" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Redigera buskage" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Höglandshed" @@ -22529,10 +23091,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Redigera en höglandshed" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Hed" @@ -22540,5 +23102,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Redigera hed" @@ -22546,5 +23108,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Gårdsplan" @@ -22553,45 +23115,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Redigera markanvändning som gårdsplan" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Jordbruksmark" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Redigera användning av mark för jordbruk" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Äng" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Redigera markanvändning som äng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vingård" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Redigera användning av mark för vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Kolonilotter" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Redigera användning av mark för koloniområden" @@ -22599,25 +23161,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Trädgård" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Redigera trädgård" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Gräs" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Redigera markanvändning som gräsyta" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Allmänning" @@ -22625,10 +23187,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Redigera användning av mark för allmänning" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Allmänning" @@ -22636,20 +23198,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Redigera allmänning" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Redigera park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Fritidsområde" @@ -22657,5 +23219,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Redigera användning av mark för fritidsområde" @@ -22663,15 +23225,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Bostadsområde" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Redigera användning av mark för bostadsområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Kyrkogård" @@ -22679,9 +23241,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Redigera kyrkogård" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Begravningsplats" @@ -22689,39 +23251,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Redigera användning av mark för begravningsplats" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Detaljhandel" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Redigera användning av mark för detaljhandel" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Affärsområde" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Redigera användning av mark för affärsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Industriområde" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Redigera användning av mark för industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Järnvägsmark" @@ -22729,15 +23291,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Redigera användning av mark för järnvägsmark" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militärt område" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Redigera användning av mark för militärt område" @@ -22745,55 +23307,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Byggnadsplats" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Redigera markanvändning som byggnadsplats" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Deponi" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Redigera användning av mark för deponi av avfall" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Stenbrott" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Redigera användning av mark för stenbrott" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multipolygon" @@ -22803,5 +23365,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Redigera en multipolygon" @@ -22810,10 +23372,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "yttre segement" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "inre segment" @@ -22821,5 +23383,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22828,5 +23390,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22834,34 +23396,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Begränsning" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "ingen_vänstersväng" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "ingen_högersväng" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "inte_rakt_fram" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "ingen_u_sväng" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "enbart_högersväng" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "enbart_vänstersväng" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "enbart_rakt_fram" @@ -22870,15 +23432,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "från sträcka" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "via nod eller sträcka" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "till sträcka" @@ -22886,5 +23448,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22893,5 +23455,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22899,5 +23461,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22969,24 +23531,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "cykel" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -23039,5 +23601,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23046,13 +23608,13 @@ msgstr "fot" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -23066,10 +23628,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "tunnelbana" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -23077,31 +23639,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -23110,30 +23672,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23344,130 +23906,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23484,98 +23920,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "förlegad" @@ -23952,7 +24297,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "landsvägsspår" @@ -24016,13 +24361,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "räls" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24038,5 +24462,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -24050,5 +24474,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -24069,5 +24493,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "vändplats" @@ -24082,5 +24506,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -24095,5 +24519,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "flodbank" @@ -24107,5 +24531,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "bäck" @@ -24119,5 +24543,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "hamn" @@ -24139,16 +24563,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "akvedukt" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24245,4 +24657,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24311,13 +24730,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "byggnadsverk" @@ -24363,6 +24782,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24379,7 +24798,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "järnvägspunkt" @@ -24402,10 +24821,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24441,11 +24860,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24486,6 +24906,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24499,5 +24919,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -24519,5 +24939,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24531,5 +24951,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24537,4 +24957,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24584,7 +25011,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "linbana" @@ -24601,5 +25028,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24614,5 +25041,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24627,5 +25054,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24640,5 +25067,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24653,5 +25080,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24666,5 +25093,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24784,11 +25211,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "kraft" @@ -24802,5 +25229,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "pir" @@ -24814,5 +25241,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "rörledning" @@ -24940,12 +25367,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "fritid" @@ -24959,5 +25403,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "marina" @@ -24995,4 +25439,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25011,4 +25471,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25029,8 +25497,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "inrättning" @@ -25132,10 +25602,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "trafikinrättning" @@ -25389,5 +25859,5 @@ #. #. -#. +#. #. color health #. @@ -25533,4 +26003,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25550,23 +26028,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25598,6 +26076,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25658,14 +26136,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "hälsa" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26012,5 +26490,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26033,5 +26510,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "affär" @@ -26103,8 +26581,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotell" @@ -26205,9 +26683,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turism" @@ -26295,9 +26773,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "historisk" @@ -26311,5 +26789,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "stenbrott" @@ -26323,5 +26801,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26343,5 +26821,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "hamnbassäng" @@ -26355,5 +26833,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "skog" @@ -26367,5 +26845,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "gårdsplan" @@ -26388,5 +26866,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "detaljhandel" @@ -26400,5 +26878,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "industri" @@ -26412,5 +26890,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26424,5 +26902,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26436,5 +26914,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26491,7 +26969,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "militär" @@ -26505,5 +26983,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "begravningsplats" @@ -26516,5 +26994,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "topp" @@ -26529,5 +27007,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "glaciär" @@ -26541,5 +27019,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "vulkan" @@ -26594,8 +27072,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "naturfenomen" @@ -26609,5 +27087,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "buskage" @@ -26621,5 +27099,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "hed" @@ -26633,5 +27111,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26645,5 +27123,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "lera" @@ -26657,5 +27135,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "strand" @@ -26733,8 +27211,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "rutt" @@ -26782,7 +27260,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "gräns" @@ -26932,11 +27410,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "plats" @@ -26984,6 +27462,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adress" @@ -27339,98 +27817,122 @@ msgstr "" +#~ msgid "Updating primitive" +#~ msgstr "Uppdaterar primitiv" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "En avslutande parentes förväntades" + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är " -#~ "närvarande" - -#~ msgid "Images for {0}" -#~ msgstr "Bilder för {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Läs in GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Tid saknas för punkt {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Inga bilder med läsbara tidsangivelser hittades." - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS startpunkt: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS slutpunkt: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "nuvarande delta: {0}s" +#~ "Antal ändringar överskrider det maximala antalet ändringar, antal " +#~ "ändringar är {0}, max är {1}" + +#~ msgid "" +#~ "I can take a picture of my GPS receiver.
Can this help?" +#~ msgstr "" +#~ "Jag kan ta en bild av min GPS-mottagare.
Kan detta vara till " +#~ "nytta?" + +#~ msgid "All images" +#~ msgstr "Alla bilder" + +#~ msgid "Images with no exif position" +#~ msgstr "Bilder utan positionsangivelse i exif" + +#~ msgid "Not yet tagged images" +#~ msgstr "Bilder som inte taggats ännu" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Hittade {0} träffar för {1} i GPX-spår {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPX-spår har hämtats" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Förskjutning mellan spår och foton: {0}m {1}s" + +#~ msgid "Default Values" +#~ msgstr "Standardinställningar" + +#~ msgid "Enable proxy server" +#~ msgstr "Aktivera proxyserver" + +#~ msgid "Anonymous" +#~ msgstr "Anonym" + +#~ msgid "Proxy server host" +#~ msgstr "Värd för proxyserver" + +#~ msgid "Proxy server port" +#~ msgstr "Port för proxyserver" + +#~ msgid "Proxy server username" +#~ msgstr "Användarnamn för proxyserver" + +#~ msgid "Proxy server password" +#~ msgstr "Lösenord för proxyserver" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, Det saknas förmodligen några taggar." + +#~ msgid "Preparing..." +#~ msgstr "Förbereder..." + +#~ msgid "Uploading..." +#~ msgstr "Skickar in..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Felaktigt lösenord eller användarnamn." + +#~ msgid "Enter Password" +#~ msgstr "Ange lösenord" + +#~ msgid "Login" +#~ msgstr "Logga in" + +#~ msgid "Auto-tag source added:" +#~ msgstr "Tagg för källa har automatiskt lagts till:" + +#~ msgid "Interpolation" +#~ msgstr "Interpolering" + +#~ msgid "Optional" +#~ msgstr "Valfri" + +#~ msgid "Shop" +#~ msgstr "Affär" + +#~ msgid "aqueduct" +#~ msgstr "akvedukt" + +#~ msgid "Move" +#~ msgstr "Flytta" + +#~ msgid "Email" +#~ msgstr "Email" #~ msgid "timezone difference: " #~ msgstr "tidsskillnad: " -#~ msgid "{0} within the track." -#~ msgstr "{0} inom spåret." - -#~ msgid "Sync clock" -#~ msgstr "Synka klocka" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Datum i fil \"{0}\" kunde inte tolkas." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"." +#~ msgid "Unsaved Changes" +#~ msgstr "Osparade ändringar" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Unknown version" +#~ msgstr "Okänd version" + +#~ msgid "unnamed" +#~ msgstr "namnlös" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Angiven tid kunde inte tolkas." #~ msgid "Image" #~ msgstr "Bild" -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Tidszon för GPS-enhet (skillnad mot foto)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Synkronisera Tid med GPS-enheten" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Angiven tid kunde inte tolkas." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Geotaggade bilder" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Öppna bilder med AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "inställningar för osmarender" - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "\"Another geotag plugin\" (Ytterligare ett geotag-plugin) för JOSM. " -#~ "Korrelerar bilder med GPS-spår eller importerar EXIF-geotaggade bilder." - -#~ msgid "Move" -#~ msgstr "Flytta" - -#~ msgid "Email" -#~ msgstr "Email" - -#~ msgid "Unsaved Changes" -#~ msgstr "Osparade ändringar" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "Unknown version" -#~ msgstr "Okänd version" - -#~ msgid "unnamed" -#~ msgstr "namnlös" - #~ msgid "OSM username (email)" #~ msgstr "OSM-användarnamn (email)" @@ -27441,7 +27943,4 @@ #~ msgid "Unknown file extension." #~ msgstr "Okänd filändelse." - -#~ msgid "File could not be found." -#~ msgstr "Filen kunde inte hittas." #~ msgid "All the ways were empty" @@ -27542,4 +28041,40 @@ #~ msgstr "Konflikter upptäcktes under import." +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Inga bilder med läsbara tidsangivelser hittades." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Tid saknas för punkt {0} x {1}" + +#~ msgid "Images for {0}" +#~ msgstr "Bilder för {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Läs in GPX..." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS startpunkt: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "nuvarande delta: {0}s" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS slutpunkt: {0}" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)" + +#~ msgid "Sync clock" +#~ msgstr "Synka klocka" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Datum i fil \"{0}\" kunde inte tolkas." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"." + #~ msgid "name" #~ msgstr "namn" @@ -27553,4 +28088,7 @@ #~ msgid "File not found" #~ msgstr "Filen hittades inte" + +#~ msgid "{0} within the track." +#~ msgstr "{0} inom spåret." #~ msgid "Login name (email) to the OSM account." @@ -27617,4 +28155,7 @@ #~ msgstr "Navigation" +#~ msgid "osmarender options" +#~ msgstr "inställningar för osmarender" + #~ msgid "requested: {0}" #~ msgstr "begärd: {0}" @@ -27682,4 +28223,7 @@ #~ msgstr "Redigera egenskaper" +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Tidszon för GPS-enhet (skillnad mot foto)" + #~ msgid "Plugin already exists" #~ msgstr "Insticksmodulen finns redan" @@ -27703,4 +28247,10 @@ #~ msgid "Import TCX File..." #~ msgstr "Importera TCX-fil..." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotaggade bilder" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Öppna bilder med AgPifoJ..." #~ msgid "Metacarta Map Rectifier image id" @@ -27929,4 +28479,7 @@ #~ msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder." +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synkronisera Tid med GPS-enheten" + #~ msgid "Basic" #~ msgstr "Grundläggande" @@ -28040,4 +28593,11 @@ #~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller " #~ "laddat ner ett datalager?" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "\"Another geotag plugin\" (Ytterligare ett geotag-plugin) för JOSM. " +#~ "Korrelerar bilder med GPS-spår eller importerar EXIF-geotaggade bilder." #~ msgid "Remove route nodes" @@ -28181,4 +28741,10 @@ #~ "\"{1}\">ditt språk." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är " +#~ "närvarande" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "Hjälpsida saknas. Skapa den på engelska." Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 19198) +++ /applications/editors/josm/i18n/po/tr.po (revision 19199) @@ -6,11 +6,12 @@ # Cezmi Topaloğlu , 2009. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-29 22:29+0000\n" -"Last-Translator: katpatuka \n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-16 00:31+0000\n" +"Last-Translator: Ali Isingor \n" "Language-Team: Türkçe\n" "MIME-Version: 1.0\n" @@ -18,38 +19,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Arayüz Oluşturuluyor." #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Yardım" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Yanlış linkler atlanıldı: URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -61,21 +62,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -96,17 +97,8 @@ msgstr "Uyarı" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "hatalı dosya atlandı URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -114,8 +106,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -123,10 +124,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -138,9 +139,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -149,6 +151,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -203,8 +205,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -272,5 +274,5 @@ msgstr "JOSM Hakkında..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -279,5 +281,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -286,5 +288,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -293,15 +295,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -310,29 +317,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -349,5 +357,9 @@ msgstr "İptal" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -363,5 +375,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Birleştir" @@ -379,15 +391,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Nokta Ekle..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Enlem ve Boylam girerek nokta ekle." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -403,22 +415,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Düzenle: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Yeni nokta için koordinat giriniz." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Ondalık derece kullan." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatif sayılar Batı/Güney yarımküreyi gösterir ." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -427,5 +439,5 @@ msgstr "Enlem" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -434,28 +446,29 @@ msgstr "Boylam" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +msgstr "Lütfen -90..90 aralığında geçerli bir enlem değeri girin" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +msgstr "Lütfen -90..90 aralığında bir enlem değeri girin" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +msgstr "Lütfen -90..90 aralığında geçerli bir boylam değeri girin" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +msgstr "Lütfen -90..90 aralığında bir boylam değeri girin" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -467,9 +480,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -490,18 +503,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -513,5 +526,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -533,6 +546,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -579,5 +592,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "çakışma" @@ -614,14 +627,15 @@ msgstr "Yakınlaştıracak bir çakışma yok." -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -631,21 +645,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Dosya: {0}" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -msgid "There are no open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "" @@ -730,11 +744,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -796,5 +811,5 @@ #, java-format msgid "Id > 0 required, got {0}" -msgstr "" +msgstr "Id > 0 gerekiyordu, {0} elde edildi" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89 @@ -812,16 +827,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -857,5 +877,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Çift" @@ -881,27 +901,27 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" -msgstr "" +msgstr "Tüm dosya biçimleri" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Tam Ekran Görünüm" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Tam ekran görünümüne geç" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 msgid "Toggle Fullscreen view" -msgstr "" +msgstr "Tam Ekran Görünümüne geç" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "GPX olarak kaydet..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Veri GPX dosyası olarak kaydet." @@ -916,12 +936,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -946,8 +966,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -958,10 +978,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -974,17 +994,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1006,5 +1026,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19 msgid "Object history" -msgstr "" +msgstr "Nesne geçmişi" #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17 @@ -1021,22 +1041,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Lütfen birleştirmek için en az iki yol seçiniz." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1049,38 +1074,34 @@ "Devam etmek istiyormusunuz?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "lütfen emin değilseniz iptal ediniz" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +msgstr "Üstüste gelen alanlar birleştirildi" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1088,33 +1109,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Bütün çakışmaları için yeni değerler gir." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Çakışmaları Çöz" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgstr "Etiket çakışmalarını düzelt" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgstr "Kapatılmış Yol" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1139,5 +1160,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 msgid "Jump To Position" -msgstr "" +msgstr "Konuma Git" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 @@ -1147,5 +1168,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 msgid "Enter Lat/Lon to jump to position." -msgstr "" +msgstr "Gitmek istediğiniz konumun enlem/boylamını girin." #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 @@ -1155,10 +1176,10 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 msgid "Zoom (in metres)" -msgstr "" +msgstr "Büyüt (metre)" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "URL" -msgstr "" +msgstr "URL" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 @@ -1168,5 +1189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 msgid "Jump to Position" -msgstr "" +msgstr "Konuma Git" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 @@ -1201,5 +1222,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 msgid "Abort Merging" -msgstr "" +msgstr "Birleştirmey iptal et" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128 @@ -1231,5 +1252,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77 msgid "Mirror" -msgstr "" +msgstr "Yansı" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 @@ -1277,5 +1298,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Objeleri dünya dışına taşıyamazsın." @@ -1303,10 +1324,10 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69 msgid "Opening files" -msgstr "" +msgstr "Dosyaları açıyor" #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88 #, java-format msgid "Opening file ''{0}'' ..." -msgstr "" +msgstr "''{0}'' dosyası açılıyor..." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39 @@ -1321,5 +1342,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 msgid "Separate Layer" -msgstr "farklı Tabaka" +msgstr "Farklı Katman" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70 @@ -1329,54 +1350,54 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77 msgid "Enter URL to download:" -msgstr "" +msgstr "İndirilecek URL'yi girin:" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79 msgid "Enter an URL from where data should be downloaded" -msgstr "" +msgstr "Verinin indirileceği URL'yi girin:" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88 msgid "Download Location" -msgstr "Lokasyonu indir" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 msgid "Download URL" -msgstr "" +msgstr "URL'yi indir" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94 msgid "Start downloading data" -msgstr "" +msgstr "Veriyi indirmeye başla" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95 msgid "Close dialog and cancel downloading" -msgstr "" +msgstr "Pencereyi kapat ve indirmeyi iptal et" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109 msgid "Download Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +msgstr "Veriyi İndir" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Dikdörtgen olarak şekilendir" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Noktaları taşı, açılar 90 veya 270 derece olsun" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1385,9 +1406,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1396,16 +1417,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 -msgid "Usage" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 -msgid "Selected Elements cannot be orthogonalized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 msgid "Orthogonalize" msgstr "Dikdörtgenleştir" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 +msgid "Usage" +msgstr "Kullanım" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 +msgid "Selected Elements cannot be orthogonalized" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1477,20 +1498,20 @@ #, java-format msgid "Could not rename file ''{0}''" -msgstr "" - +msgstr "''{0}'' dosyası yeniden adlandırılamadı" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Yolları ters çevir" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Seçili yollar için yönü ters çevir." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Lütfen en az bir yol seçiniz." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Yolları ters çevir" @@ -1499,10 +1520,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Kaydet" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Şimdiki bilgiyi kaydet." @@ -1511,5 +1532,5 @@ #, java-format msgid "File {0} exists. Overwrite?" -msgstr "" +msgstr "{0} dosyası mevcut. Üzerine yaz?" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 @@ -1527,5 +1548,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 msgid "The document contains no data." -msgstr "" +msgstr "Belge veri içermiyor." #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 @@ -1535,5 +1556,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 msgid "Reject Conflicts and Save" -msgstr "" +msgstr "Çakışmaları Reddet ve Kaydet" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 @@ -1553,14 +1574,14 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 msgid "Save Layer" -msgstr "" +msgstr "Katmanı Kaydet" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Farklı Kaydet..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Varolan bilgileri yeni bir dosyaya kaydet." @@ -1582,5 +1603,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" -msgstr "" +msgstr "Durum Raporunu Göster" #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 @@ -1595,5 +1616,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" -msgstr "" +msgstr "Durum Raporu" #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 @@ -1603,9 +1624,8 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" -msgstr "" +msgstr "Kapat" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 @@ -1633,5 +1653,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1688,5 +1708,5 @@ "Yol seçili kavşaktan bölünemez. (İpucu: Yolun ortasından kavşak seçiniz)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1694,5 +1714,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1700,5 +1720,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1732,33 +1752,33 @@ msgstr "Bu kavşak başka bir nesneye yapışık değil." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Kavşakların hiçbiri herhangi bir nesneye yapışık değil." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Yolların kavşakları herhangi nesneye yapışık değil." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Seçim çıkartmak için kullanılamaz." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Şunların Arasında Seçiniz:" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +msgid "* One tagged node, or" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way, or" msgstr "* Birden fazla yol için kullanılan kavşak, veya" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* Birden fazla yol için veya şu yollardan biri için, veya" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1767,5 +1787,5 @@ "kullanılabilir, veya" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1773,5 +1793,5 @@ "* Yolun bir veya birkaç kavşağı, birden fazla yol tarafında kullanılabilir." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1784,9 +1804,9 @@ "kopyalarını oluşturur ve bütün kavşaklar seçilir" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1794,5 +1814,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1827,10 +1847,10 @@ msgstr "Seçimleri Kaldır (Kaçış)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgstr "Veriyi güncelle" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1838,53 +1858,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +msgstr "Veriyi indir" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Seçimi güncelle" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +msgstr "Seçimi Güncelle" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1893,5 +1909,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1899,131 +1915,7 @@ msgstr "Yüklenilecek değişiklik yok." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2158,9 +2050,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Bilgi İndiriliyor" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2168,5 +2060,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2237,7 +2129,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2254,58 +2146,52 @@ "kavşakları silmebir yol silerken. Ctrl:referans objelerini sil" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Çiz" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Kavşakları Çiz" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Mode: Odağı Çiz" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "seçilmiş" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Dünya dışına bir kavşak ekleyemezsiniz." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Kavşak Ekle" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Yola kavşak ekle" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Varolan yolu kavşağa ekle" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Varolan yola kavaşka ekle" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Yola kavşak ekle ve birleştir" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2314,14 +2200,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "" @@ -2363,18 +2249,19 @@ "senkronize etmek için." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Seçiniz" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Objeyi seç,taşı ve dönder" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2383,17 +2270,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2403,13 +2290,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2418,9 +2305,9 @@ "yapıştır." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2430,5 +2317,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zoom" @@ -2452,5 +2339,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Objeleri ara." @@ -2546,8 +2433,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2555,45 +2450,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2601,55 +2502,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Arama" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "''{0}'' için herhangi karşılık bulunamadı" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "''{0}'' için yapılan aramada, herhangi birşey çıkartılmadı" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "{0} Eşleşme bulundu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2662,40 +2563,43 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "or için eksik argüman." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "not için eksik argüman." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Parantezlerin kapanması beklenir." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "or için eksik argüman." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2704,9 +2608,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2715,7 +2619,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2749,17 +2658,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 -msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 #, java-format msgid "" @@ -2767,5 +2664,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 #, java-format msgid "" @@ -2774,11 +2671,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgid "API Capabilities Violation" msgstr "" @@ -2890,5 +2791,5 @@ msgstr "Ayarla {0}={1} için {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2903,5 +2804,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -3001,4 +2902,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3110,5 +3026,5 @@ msgstr "Uygula?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3192,15 +3108,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3209,5 +3125,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3216,5 +3132,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3223,5 +3139,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3230,5 +3146,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3236,5 +3152,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3243,5 +3159,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3250,5 +3166,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3257,5 +3173,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3264,10 +3180,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3275,24 +3191,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Tercihler {0} üzerinde saklanıldı" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Could not upload preferences. Reason: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Tercihler serverdan alınamadı." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3301,5 +3217,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3328,5 +3244,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3348,31 +3264,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "G" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "K" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "B" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "D" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3380,5 +3289,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3389,27 +3298,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3417,5 +3326,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3427,5 +3336,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3433,25 +3342,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3459,43 +3368,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "parametre ''{0}'' zero (null) olamaz" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3503,5 +3424,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3529,10 +3450,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3540,7 +3457,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3555,5 +3472,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3571,146 +3488,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "Alan stili yol kapalı değil." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "multipoligon yolu ''{0}'' kapalı değil." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "''{0}'' üyesini ilişkiden sil." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Yol ''{0}'' iki noktadan az içeriyor." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "iç yol ''{0}'' dışarıda." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Kullanışlı rol yok ''{0}'' ''{1}'' yolu için." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Yol-Değil ''{0}'' multipolygon içinde." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipoligon için dış yol yok ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "İç yol stili ''{0}'' multipolygon ." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Dış yol stili ''{0}'' bulunamadı." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "etiketsiz" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "metin" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Hata: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Uyarı: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "durgun" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "seçilmiş" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3718,6 +3627,6 @@ msgstr[0] "kavşak" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3725,7 +3634,8 @@ msgstr[0] "yol" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3733,20 +3643,36 @@ msgstr[0] "ilişki" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "etiketsiz yol" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "eksik yol" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "arkaplan" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" +msgstr "" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "etiketsiz" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "metin" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" msgstr "" @@ -3889,5 +3815,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "demiryolu" @@ -3903,7 +3829,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3917,4 +3843,10 @@ msgstr[0] "{0} üye" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3946,6 +3878,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Çelişki" @@ -3959,7 +3891,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4045,74 +3977,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "KullanıcıAdı" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "şifre" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "kullanım" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "seçenekler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Bu Yardımı Göster" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Standart unix geometry argümanı" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Kutu ile belirlenen sınırları indir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Linkteki bilgiyi indir (lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Dosya Aç (ham gps, eğer .gpx ise)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Kutu ile belirlenen alanı ham gps olarak indir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Yapılan aramaya göre seçim yap" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Tercihleri varsayılan değerlere getir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Dil seçimi." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4121,9 +4053,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "örnekler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4133,36 +4065,36 @@ "bir harita yükleyiniz --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "--download= indirmek yerine osm:// kullanabilirsin\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Güncellenen eklentiler aktif olacak" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Eski eklentiler yükleniyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Varsayılan ayarlar alınıyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Eklentiler yükleniyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Dosya" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4177,22 +4109,22 @@ msgstr "Düzenle" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Görünüm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Araçlar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Ayarlanmış" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4200,5 +4132,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Ses" @@ -4277,13 +4209,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "tabaka listede yok." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4316,5 +4249,5 @@ msgstr "Ayarlar Okunuyor" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4322,6 +4255,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4330,5 +4263,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4337,5 +4270,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4344,25 +4277,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4370,9 +4303,9 @@ msgstr "Rol" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4404,11 +4337,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4417,6 +4350,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4424,6 +4357,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4431,40 +4364,40 @@ msgstr "Üyeler" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4472,21 +4405,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4518,22 +4451,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4541,5 +4474,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4547,30 +4480,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4578,5 +4511,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4584,14 +4517,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4599,5 +4532,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4605,23 +4538,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4632,27 +4565,27 @@ msgstr "Çıkart" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4661,5 +4594,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4668,5 +4601,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4675,5 +4608,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4682,5 +4615,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4689,5 +4622,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4697,5 +4630,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4930,10 +4863,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4943,10 +4876,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5031,9 +4964,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5041,6 +4974,6 @@ msgstr "boş" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "hepsi" @@ -5129,7 +5062,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5138,6 +5071,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5244,4 +5177,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Seçili Objeleri Sil." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Değerleri Değiştir?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "İndir" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Harita verisi OSM sunucusundan indir." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Seçili Objeleri Sil." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Seçili ilişki için bir editör aç." + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5255,12 +5240,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5278,18 +5263,18 @@ msgstr "Komut Yığını: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Çözümle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "Seçili nesneler için birleştime penceresi aç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5297,25 +5282,25 @@ msgstr "Haritada seçili elemanları listedede seç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5327,26 +5312,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5357,41 +5342,41 @@ msgstr "Ekle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5430,5 +5415,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5443,34 +5428,34 @@ msgstr "Yüklenilmiş olan tabakaların listesini göster." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Seçili tabakayı sil." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Göster/Sakla" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Seçili tabakanın görünen kısmını sabitle." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Seçili tabakayı bir satır yukarı taşı." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Seçili tabakayı bir satır aşağı taşı." @@ -5480,5 +5465,175 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "İlişkiler" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "İlişkilerin listesini göster." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "İlişkiler: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Seçili ilişki için bir editör aç." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Seçili ilişkiyi sil" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Yeni ilişki oluştur" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Güncel Seçim" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Seçim listesi penceresini aç." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Seçili eleman(lara) yakınlaş" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Seçime yakınlaş" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Seçim.: İlişki.:{0} / Yollar:{1} / Kavşaklar:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Seçim" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Seçim: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Panelin kilidini Kaldır" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "paneli büyütüp/küçültmek için tıklayınız" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Yazarlar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Seçili obje üzerinde çalışna kişilerin listesini göster." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "yazar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Objeler" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "eksik" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "Kapat" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Veriyi İndir" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5487,22 +5642,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Değerleri Değiştir?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5510,5 +5665,5 @@ msgstr[0] "Değerleri {0} obje için değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5516,226 +5671,71 @@ msgstr[0] "İşlem {0} objeyi değiştirecek." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Lütfen bir anahtar seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Lütfen bir değer seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Özelliklerini değiştirmek istediğiniz objeleri seçiniz." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Özellikler/Üyelikler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Seçili objenin özellikleri" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Üyesi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Özellik Ekle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Özellik: {0} / Üyelik: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Özellik / Üyelik" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "İlişkiyi değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Seçili anahtarı her objeden sil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Özelliği Sil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Seçili anahtarın değerini her obje için düzenle" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "İlişkiler" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "İlişkilerin listesini göster." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "İlişkiler: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Seçili ilişki için bir editör aç." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Seçili ilişkiyi sil" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Yeni ilişki oluştur" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Güncel Seçim" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Seçim listesi penceresini aç." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Seçili eleman(lara) yakınlaş" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Seçime yakınlaş" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Seçim.: İlişki.:{0} / Yollar:{1} / Kavşaklar:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Seçim" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Seçim: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Panelin kilidini Kaldır" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "paneli büyütüp/küçültmek için tıklayınız" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Yazarlar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Seçili obje üzerinde çalışna kişilerin listesini göster." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "yazar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Objeler" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5797,13 +5797,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Bütün eksik yolları ve kavşakları ilişkili olarak indir" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Lokasyonu indir" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5830,9 +5830,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Seçili ilişki için bir editör aç." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5841,14 +5840,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5858,9 +5857,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5870,15 +5869,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5886,5 +5885,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5892,20 +5891,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 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:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5914,70 +5913,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Spor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 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:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5986,9 +5984,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -5997,48 +5995,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Üyeleri İndir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6048,34 +6045,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6187,10 +6184,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6200,5 +6197,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6282,9 +6279,4 @@ msgid "Download Area" msgstr "Alanı indir" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "İndir" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6583,6 +6575,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6595,6 +6585,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6865,4 +6853,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7085,5 +7077,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7126,116 +7118,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "İsim" @@ -7259,15 +7251,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Tip" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7438,10 +7430,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7449,5 +7441,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7455,9 +7447,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7572,6 +7564,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "bilinmeyen" @@ -7593,13 +7585,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7634,4 +7626,116 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7650,39 +7754,146 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +msgid "Upload to a new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Kapanıyor..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "KullanıcıAdı ve şifreyi Sakla (Düz Metin Olarak)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Lütfen bir kullanıcı adı giriniz" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Uyarı: Şifre düz metin olarak ileticektir." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Atletik" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "İlişkiyi değiştir" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7749,17 +7960,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7772,9 +7983,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7788,9 +7999,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7805,50 +8016,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Vazgeç ve Çık" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7856,5 +8067,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7927,40 +8138,372 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "büyük_meydan" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Yüklü eklentileri ayarla." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "''{0}'' ı kullan" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Hakkında" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Silmek için bir satır seçiniz." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Eklenilecek objeler:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Düzenlenecek objeler:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Silinecek objeler:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7969,5 +8512,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -7976,5 +8519,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -7983,207 +8526,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "lütfen ilk olarak istenilen koordinatı giriniz." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} metre" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Lütfen bir kullanıcı adı giriniz" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps noktası" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Çizimi özelleştir" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Genel ayarları kullan." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Bu tabaka için çizgiler arasını birleştir." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Bu tabaka için çizgileri birleştirme." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Çizim seçeneklerini seçiniz" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8191,5 +8564,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8198,5 +8571,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8278,5 +8651,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "" @@ -8306,10 +8679,10 @@ msgstr[0] "{0} yol noktaları" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Bilgi tabakasına çevir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8319,12 +8692,12 @@ "yüklemek isterseniz buraya bakınız:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8333,29 +8706,29 @@ msgstr "Çevrildiği yer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "OSM den bu izi indir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Bunun içindeki herşeyi indir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} metre" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Her istek için max. alan:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8366,9 +8739,9 @@ "istiyor musunuz?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Tabakada ses ile ilişkilendirilecek GPX izi yok." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8376,5 +8749,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8383,23 +8756,23 @@ "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "indirilen alanın dışında" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8408,5 +8781,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8420,5 +8793,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8431,11 +8804,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8444,36 +8817,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} şunları içerir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "GPX tabakasına çevir" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8481,5 +8854,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8488,10 +8861,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" msgstr[0] "nokta" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8499,5 +8872,5 @@ msgstr[0] "{0} noktalı iz" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8505,5 +8878,5 @@ msgstr[0] "{0} {1} izden oluşur" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8511,24 +8884,24 @@ msgstr[0] "{0} nokta" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX Dosyaları (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "{0} Dosyası \"{1}\" ismi ile yüklendi" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Ayrıştırma sırasında hata {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Okunamadı \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8540,34 +8913,34 @@ "seçiniz

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Fotoğraf zamanı (exif den):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Gps zamanı (fotoğraftan okundu): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [gg/aa/yyyy sa:dk:sn]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Şu zaman dilimindeyim: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Tarih Yok" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Başka bir fotoğraf aç" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "GPS receiver ile Fotoğrafın zamanını eşitle" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8577,69 +8950,156 @@ "Lütfen istenen formatı kullanın" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Geçersiz Tarih" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX izi: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Başka GPX izi aç" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Burası için pozisyon güncelle: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Zamandilimi: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Offset:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "GPS alıcımın resmini çizebilirim.
yardımcı olurmu?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Burası için pozisyon güncelle: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Bütün imajlar" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "exif pozisyonu olmayan imajlar" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "imaj henuz etiketlenmedi" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "seçilmiş" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "imaj ile GPX izini ilişkilendir" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Geçersiz zaman dilimi" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Geçersiz offset" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "İzleniyor" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "GPX izi seçmelisiniz" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "seçili GPX izi yok" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8650,9 +9110,5 @@ "İstenen format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Geçersiz zaman dilimi" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8663,186 +9119,154 @@ "İstenen format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Geçersiz offset" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX izi yüklendi" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "EXIF den GPS verisi çıkartılıyor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "klasör arama başladı" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Fotoğraflar okunuyor..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "{0} Okunuyor..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Kananoik yol klasör için bulunamadı {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Klasör aranıyor {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Klasörde null dosya bulundu {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Klasörden dosya alınmasında hata oluştu {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Geotagged Görüntüler" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "GPX e göre ilişkilendir" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" msgstr[0] "görüntü" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} gps için etiketlenecek bulundu." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Dosya bulunamadı." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Görüntü Yok" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Yükleniyor {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Dosyada Hata {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "geotagged fotoğraflar" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Önceki" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Önceki Görüntü" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Anahtar: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Fotoğrafı tabakadan kaldır" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +msgid "Delete File from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Sonraki" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Sonraki Görüntü" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Merkezi görünüm" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Görüntüyü Ekrana oturt 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8853,5 +9277,5 @@ "Yükseklik: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8948,4 +9372,12 @@ msgid "Error displaying URL" msgstr "Linkin gösterilmesinde hata" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9163,7 +9595,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "" @@ -9232,6 +9663,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Bisiklet" @@ -9618,31 +10049,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Proxy kullan" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonymous" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Hostel" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Port:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "şifre" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Proxy Ayarları" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Proxy server host" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Proxy server port" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Proxy server kullanıcı_adı" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Proxy server şifresi" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "OSM için asıl link" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Asıl Link" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM şifresi" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9937,5 +10427,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9945,13 +10435,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9959,18 +10449,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Seçilebilen Özellikler:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9981,16 +10471,16 @@ msgstr "Etiketteki özellikler okunamadı: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "İşleme Hatası {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -9998,18 +10488,18 @@ msgstr[0] "{0} Objeyi Değiştir" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Özellikleri Değiştir" @@ -10038,4 +10528,11 @@ msgstr "{0} ve {1} arası bilgiler indiriliyor" +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10051,12 +10548,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Bilgiler hazırlanıyor..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10159,16 +10711,16 @@ msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı." -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10178,40 +10730,40 @@ msgstr "OSM bilgisi indiriliyor..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10219,9 +10771,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "{0} ve {1} arası bilgiler indiriliyor" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10258,14 +10811,14 @@ msgstr "NMEA içeri alınmasında hata!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10274,16 +10827,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10291,66 +10844,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Kapanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Hazırlanıyor..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Yükleniyor..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Bilgiler hazırlanıyor..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "{0} Objeyi Değiştir" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10376,4 +10940,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10385,5 +10959,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10410,5 +10984,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10416,5 +10990,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10427,5 +11001,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10436,57 +11010,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Hatalı kullanıcı adı veya şifre." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Uyarı: Şifre düz metin olarak ileticektir." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "KullanıcıAdı ve şifreyi Sakla (Düz Metin Olarak)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Enter Password" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "OSM için asıl link" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Asıl Link" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM şifresi" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10576,5 +11099,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10583,38 +11113,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10622,19 +11152,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Ref=0, eksik tanımı." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Geçersiz obje bulundu id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10644,8 +11174,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10655,25 +11185,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10681,5 +11227,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10688,5 +11234,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10694,5 +11240,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10701,13 +11247,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10730,21 +11276,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Kapanıyor..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "{0} ve {1} arası bilgiler indiriliyor" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10772,9 +11329,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10835,5 +11388,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10842,4 +11395,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +msgid "Unexpected id 0 for osm primitive found" msgstr "" @@ -10882,12 +11439,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Sil {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Eklentinin silinmesinde hata: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11028,9 +11585,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "Açıklama mevcut değil" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11161,4 +11718,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11448,6 +12020,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "İzleri Yükle" @@ -11533,5 +12105,5 @@ msgstr "İzleri Yükle" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "İzleri openstreetmap.org sitesine yükle" @@ -11542,5 +12114,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Adres İnterpolasyon" @@ -11555,11 +12127,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11570,24 +12139,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Numara" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "doğal" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "görüntü" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "araç kiralam" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11717,5 +12282,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11777,21 +12342,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11800,13 +12365,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11831,17 +12396,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11853,18 +12418,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11872,5 +12437,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11878,52 +12443,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12125,5 +12687,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12314,5 +12876,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Bilgi yüklenemedi." @@ -12334,9 +12896,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12724,7 +13286,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "su" @@ -12881,19 +13443,19 @@ msgstr "Görünüt alınamadı" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Bağlanıyor" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Bağlı" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Bağlı Değil" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Bağlantı Hatası" @@ -12932,33 +13494,33 @@ msgstr "Canlı GPS tabakası" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "GPS izini takip et" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" "gpsd server ına bağlan ve şu anki pozsiyonu CanlıGPS tabakasında göster" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Merkeze koy" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Canlı GPS verilerini tabakadfa merkeze koy." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Otomatik-Merkezleme" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Devamlı olarak canlı GPS tabakasını görüntünün ortasına getir" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "Canlı GPS" @@ -13009,9 +13571,9 @@ msgstr "Dünya'nın dışına çizim yapılamaz." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "ölçüm modu" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "ölçümler" @@ -13049,5 +13611,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13058,13 +13620,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13209,5 +13771,5 @@ msgstr "Firefox exe" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13301,5 +13863,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13375,41 +13937,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Hareketli Harita" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Mozaik Yükle" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Bütün Mozaikleri Yükle" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13578,4 +14140,42 @@ msgstr "İlk olaraklar tercihlerden etiket kaynağını seçmelisiniz." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Sokaklar" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Nokta Numarası" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13594,41 +14194,19 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Sokak Adı" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" msgstr "" @@ -13644,5 +14222,5 @@ msgstr "Onaylama hatası yok" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Grid" @@ -14300,38 +14878,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "yapılar" @@ -14345,5 +14893,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "alan" @@ -14460,10 +15008,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15167,6 +15715,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Referans" @@ -15612,5 +16160,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "" @@ -15728,5 +16276,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15738,5 +16286,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "orman" @@ -15994,4 +16542,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16023,8 +16574,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "Evet" @@ -16172,9 +16725,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "hayır" @@ -16419,5 +16973,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "yerleşim_alanı" @@ -16452,5 +17006,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "servis" @@ -16484,6 +17038,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "inşaat" @@ -16533,5 +17087,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "döner kavşak" @@ -16719,6 +17273,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "gezme" @@ -16839,5 +17393,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16863,4 +17416,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16870,15 +17424,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operator" @@ -17090,7 +17644,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "yükseklik" @@ -17509,5 +18063,5 @@ msgstr "kenef" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17517,5 +18071,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "batak" @@ -18041,32 +18595,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Açılış saati" @@ -18125,91 +18679,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18224,5 +18778,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18241,7 +18795,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Referans Numarası" @@ -18257,5 +18811,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "yer altı" @@ -18268,6 +18822,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Ücret" @@ -18306,22 +18860,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Alışveriş" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "araçlı alışveriş düzenle" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "tamirci" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "tamirci düzenle" @@ -18329,5 +18871,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "araç kiralam" @@ -18336,10 +18878,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "araç kiralam düzenle" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Paylaşım Alanı" @@ -18347,5 +18889,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Araç Paylaşım alanı düzenle" @@ -18353,10 +18895,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Bisiklet parkyeri düzenle" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "kapasite" @@ -18365,22 +18907,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "bisiklet kiralama düzenle" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Bisiklet dükkanı düzenle" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Toplu taşıma" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18390,5 +18925,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18396,5 +18931,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Referans" @@ -18402,5 +18937,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Demiryolu sonu" @@ -18408,5 +18943,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Son nokta düzenle" @@ -18414,5 +18949,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Tramvay durağı" @@ -18421,5 +18956,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "tramvay durağı düzenle" @@ -18427,5 +18962,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Demiryolu platformu" @@ -18434,5 +18969,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Demiryolu platformu düzenle" @@ -18444,5 +18979,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "referans (iz numarası)" @@ -18450,10 +18985,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Alan" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Metro Girişi" @@ -18462,10 +18997,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Metro Girişi Düzenle" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "tekerlekli sandalye" @@ -18474,5 +19009,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "otogar" @@ -18481,5 +19016,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "otogar düzenle" @@ -18487,5 +19022,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "otobüs durağı" @@ -18495,5 +19030,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "otobüs durağı düzenle" @@ -18502,17 +19037,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Sığınak" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "banket" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "otobüs platformu" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "otobüs platformu düzenle" @@ -18520,5 +19063,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taksi" @@ -18526,5 +19069,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "taksi istasyonu düzenle" @@ -18532,5 +19075,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Havaalanı" @@ -18538,15 +19081,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18554,10 +19097,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Kalınacak Yerler" @@ -18569,5 +19112,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotel" @@ -18576,15 +19119,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Hotel Düzenle" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Stars" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motel" @@ -18592,20 +19135,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Motel Düzenle" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Misafir Evi" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Misafir Evi Düzenle" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "kulübe" @@ -18613,10 +19156,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "külübe düzenle" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Hostel" @@ -18624,30 +19167,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Hostel Düzenle" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Dağcı Barakası" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Dağcı Barakası Düzenle" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Karavan Alanı" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Karavan Alanı Düzenle" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Kamp Sitesi" @@ -18655,10 +19198,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Kamp Sitesi Düzenle" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Yüyecek+içecek" @@ -18669,5 +19212,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -18675,5 +19218,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Restorant Düzenle" @@ -18681,5 +19224,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "lokanta" @@ -18687,61 +19230,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italyan" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "çinli" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "burger" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "yunan" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "alman" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "hint" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "yöresel" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "türk" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asyalı" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thai" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexican" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japanese" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Fast Food" @@ -18749,9 +19292,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Fast Food düzenle" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Kafe" @@ -18759,9 +19302,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Cafe düzenle" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pub" @@ -18769,18 +19312,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Pub Düzenle" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Biergarten Düzenle" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "" @@ -18788,9 +19331,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "GeceKlubu" @@ -18798,24 +19341,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "GeceKulubu Düzenle" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turizm" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "İlginç Yerler" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "İlginç Yerler Düzenle" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Müse" @@ -18823,9 +19366,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Müze Düzenle" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Hayvanat Bahçesi" @@ -18834,9 +19377,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Hayvanat Bahçesi Düzenle" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Seyir Yeri" @@ -18844,24 +19387,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Seyir Yeri Düzenle" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Seyir Kulesi" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Lunapark" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Lunapark Düzenle" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Sanatsal" @@ -18869,5 +19412,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Sanatsal Düzenle" @@ -18875,19 +19418,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Harita" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18925,5 +19468,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18931,28 +19474,28 @@ msgstr "sokak" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -18962,5 +19505,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18968,6 +19511,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Bisiklet" @@ -18975,5 +19518,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -18981,6 +19524,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Kayak" @@ -18988,5 +19531,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -18994,46 +19537,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "tarih" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "doğa" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "vahşiyaşam" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19041,29 +19584,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "Sığınak Düzenle" @@ -19071,25 +19614,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Mangal Alanı" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Piknik Alanı" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Piknik Alanı Düzenle" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Tarihi Alanlar" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Kale" @@ -19098,19 +19641,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Kale Düzenle" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Harabe" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Harabe Düzenle" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Arkeolojik Site" @@ -19119,9 +19662,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Arkeolojik Site Düzenle" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Savaş Alanı" @@ -19129,10 +19672,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Savaş Alanı Düzenle" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19140,5 +19683,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19146,15 +19689,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Anıt" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Anıt Düzenle" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Abide" @@ -19162,55 +19705,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Abide Düzenle" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Yol Kenar Geçişi" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Yol Kenar Geçişi Düzenle" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Yolkenarı İbadetyeri" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Yolkenarı İbadetyeri Düzenle" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Dinlenme Alanı" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Su Parkı" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Su Parkı Düzenle" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Oyun Sahası" @@ -19218,35 +19761,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Oyun Sahası Düzenle" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Balıkçılık" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Balıkçılık Düzenle" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Spor Aktivite" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadyum" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Stadyum Düzenle" @@ -19260,6 +19803,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "Spor Seç" @@ -19651,30 +20194,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "spor" @@ -19684,225 +20227,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "çoğul" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "okçuluk" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "atletik" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "avustralya_footbol" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "basebol" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basketbol" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "bowling" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "çimen bowling" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "kano" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "tırmanma" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "kriket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "cricket nets" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "croquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "bisiklet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "köpek yarışı" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "at binicilik" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "futbol" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "jimnastik" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hokey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "at_yarışı" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "motor" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "raket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "atıcılık" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "kaykay" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "paten" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "kaymak" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "futbol" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "yüzmek" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "masa_tenisi" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tenis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "spor merkezi" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "spor merkezi düzenle" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "atıcılık" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "atıcılık düzenle" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "yarış pisti" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "yarış pisti düzenle" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golf Alanı" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Golf Alanı Düzenle" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minyatür Golf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Minyatür Golf Düzenle" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Spor" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Çoğul" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Çoğul Düzenle" @@ -19941,21 +20484,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "tip" @@ -19994,203 +20537,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "atıcılık" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "spor_merkezi" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadyum" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "10pin" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "10pin Düzenle" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Atletik" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Atletik Düzenle" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "okçuluk" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "okçuluk düzenle" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "tırmanma" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "tırmanma düzenle" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Kano" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Kano Düzenle" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Bisiklet Düzenle" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Köpek Yarışı" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Köpek Yarışı Düzenle" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "binicilik" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "binicilik düzenle" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "At Yarışı" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "At Yarışı Düzenle" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "jimnastik" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "jimnastik düzenle" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Motor Sporlar" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Motor Sporları Düzenle" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "patinaj" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "patinaj düzenle" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "kaykay" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "kaykay düzenle" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "yüzme" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "yüzme düzenle" @@ -20198,56 +20741,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Kayak Düzenle" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Atıcılık" @@ -20255,182 +20798,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Atıcılık Düzenle" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Spor (Topla)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Futbol" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Futbol Düzenle" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Amerikan Futbolu" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Amerikan Futbolu Düzenle" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Avustralyan Futbol" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Avustralyan Futbol Düzenle" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Baseball Düzenle" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basketbol" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Basketbol Düzenle" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Golf Düzenle" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golf_alanı" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Boule Düzenle" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Bowling" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Bowling Düzenle" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Kricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Kricket Düzenle" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Cricket Nets" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Cricket Nets Düzenle" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Kroke" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "kroke Düzelt" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Hockey Düzenle" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Pelota Düzenle" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Raket" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Raket Düzenle" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Rugby Düzenle" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Masa Tenisi" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Masa Tenisi Düzenle" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Tennis Düzenle" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Binalar" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Bina" @@ -20438,5 +20981,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Kamu Binası" @@ -20444,10 +20987,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Kamu Binası Düzenle" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "belediye binası" @@ -20455,10 +20998,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "belediye binası düzenle" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Büyükelçilik" @@ -20466,10 +21009,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Büyükelçilik Düzenle" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "adliye sarayı" @@ -20478,10 +21021,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "adliye sarayı düzenle" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Hapishane" @@ -20490,10 +21033,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Hapishane Düzenle" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Polis" @@ -20503,10 +21046,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Polis Düzenle" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "İtfaye İstasyonu" @@ -20515,10 +21058,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "İtfaye İstasyonu Düzenle" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Postane" @@ -20526,5 +21069,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Postane Düzenle" @@ -20532,15 +21075,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Anaokul" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Anaokul Düzenle" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Okul" @@ -20548,10 +21091,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "okul düzenle" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Universite" @@ -20559,10 +21102,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Universite Düzenle" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "kolej" @@ -20570,5 +21113,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "kolej düzenle" @@ -20576,5 +21119,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Sinema" @@ -20583,10 +21126,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Sinema Düzenle" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "kütüphane" @@ -20595,9 +21138,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "kütüphane düzenle" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "sanat merkezi" @@ -20605,10 +21148,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "sanat merkezi düzenle" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Tiyatro" @@ -20617,10 +21160,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Tiyatro Düzenle" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Tapınak" @@ -20630,5 +21173,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Tapınak Düzenle" @@ -20637,6 +21180,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Din" @@ -20645,66 +21188,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "budist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "hristiyan" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "yahudi" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "müslüman" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "Zerdüştlük" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "mezhep" @@ -20713,81 +21256,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglikan" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "katholik" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "protestan" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "yahova_şahitleri" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "lutheran" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "methodist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormon" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbyterian" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adres" @@ -20796,5 +21339,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Adres Bilgileri Düzenle" @@ -20802,5 +21345,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Ev no:" @@ -20808,20 +21351,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Ev İsmi" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Sokak Adı" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Şehir Adı" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Posta Kodu" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Ülke Kodu" @@ -20830,5 +21378,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Adres İnterpolasyon Düzenle" @@ -20836,61 +21384,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Numara şeması" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "tek" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "çift" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "İnsan Yapımı" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Tesis" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Tesis Düzenle" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Kule" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Kule Düzenle" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20898,25 +21446,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Su Kulesi" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Su Kulesi Düzenle" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gazdeposu" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Gazdeposu Düzenle" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "DenizFeneri" @@ -20924,10 +21472,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "DenizFeneri Düzenle" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Yeldeğerimeni" @@ -20935,10 +21483,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Yeldeğerimeni Düzenle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Suboru Hattı" @@ -20947,37 +21495,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Suboru hattı Düzenle" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "benzin" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Kanalizasyon Plant" @@ -20987,10 +21535,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Kanalizasyon Plant Düzenle" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Vinç" @@ -20998,10 +21546,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Vinç Düzenle" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Fener" @@ -21009,10 +21557,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Fener Düzenle" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Poligon Noktası" @@ -21020,10 +21568,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Poligon Noktası Düzenle" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Gözetim" @@ -21031,5 +21579,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Gözetim Kamera Düzenle" @@ -21037,5 +21585,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Güç Jeneratorü" @@ -21045,35 +21593,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Güç Jeneratorü Düzenle" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "rüzgar" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "hidro" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fosil" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "nükleer" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "kömür" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "güneş enerjisi" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Güç İstasyonu" @@ -21082,10 +21630,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Güç İstasyonu Düzenle" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Alt Güç İstasyonu" @@ -21094,5 +21642,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Alt Güç İstasyonu Düzenle" @@ -21100,10 +21648,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "çizgi referansı" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Güç Kulesi" @@ -21114,23 +21662,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "güç Kulesi Düzenle" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Güç Hattı" @@ -21139,75 +21687,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Güç Hattı Düzenle" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Voltaj" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "hoş mekan" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Tuvalet" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Not" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Posta Kutusu" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefon" @@ -21216,5 +21764,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Telefon Düzenle" @@ -21222,5 +21770,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Madeni Para" @@ -21228,5 +21776,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Notlar" @@ -21234,5 +21782,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Elektronik cüzdan ve Para Değişim Kartları" @@ -21240,5 +21788,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "ATM kartı" @@ -21246,15 +21794,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kredi Kartı" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefon kart" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Geri Dönüşüm" @@ -21263,5 +21811,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Geri Dönüşüm İstasyonu" @@ -21269,68 +21817,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Piller" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Çöp Tenekesi" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Kıyafet" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Cam" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Kağıt" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Hurda Metal" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "banket" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21401,39 +21944,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "yeşil" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Av Standı" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Av Standı Düzenle" @@ -21442,30 +21985,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Yükseklik" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "alçak" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "yarım" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "tam" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Sakla" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Kilitle" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Kaynak" @@ -21474,10 +22017,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Kaynak Düzenle" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "İçme Suyu" @@ -21486,10 +22029,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "İçme Suyu Düzenle" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Bebek Yuvası" @@ -21497,33 +22040,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Bebek Yuvası Düzenle" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Dükkanlar" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "araçlı alışveriş düzenle" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Göl Yürüyüşü" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Bisiklet dükkanı düzenle" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Supermarket Düzenle" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Bakkal" @@ -21531,9 +22098,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Bakkal Düzenle" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosk" @@ -21541,27 +22108,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Kiosk Düzenle" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Kahve Makinası" @@ -21569,5 +22136,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Kahve Makinası Düzenle" @@ -21575,88 +22142,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Ücretli Ürünler" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "toplu_taşıma_bileti" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "toplu_taşıma_hatları" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "Park_bileti" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "yiyecek" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "içecek" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "tatlı" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "sigara" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "fotoğraf" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "hayvan_besini" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "gazeteler" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "oyuncuklar" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "pullar" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-kart" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "telefon_kartı" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "bilet" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "kondom" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampon" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "dışkı_poşeti" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "hesap veya üyelik kartı" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "kasap" @@ -21664,9 +22231,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "kasap düzenle" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "fırın" @@ -21674,9 +22241,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "fırın düzenle" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "" @@ -21684,18 +22251,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21703,54 +22270,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "" @@ -21758,9 +22325,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21768,9 +22335,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "kendin-al-market" @@ -21778,54 +22345,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "kendin-al-market düzenle" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "berber" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "berber düzenle" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Kuru Temizleme" @@ -21833,9 +22400,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Kuru Temizleme Düzenle" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Çamaşırhane" @@ -21843,9 +22410,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Çamaşırhane Düzenle" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Dışortam" @@ -21853,28 +22420,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Dış ortam dükkanları düzenle" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Kasa" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banka" @@ -21882,14 +22449,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Banka düzenle" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "ATM" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Döviz Bürosu" @@ -21897,5 +22464,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Döviz Bürosu Düzenle" @@ -21903,15 +22470,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "ATM Düzenle" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Sağlık" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Doktor" @@ -21919,18 +22486,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Doktor Düzenle" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Dişçi" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Dişçi Düzenle" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Eczane" @@ -21938,5 +22505,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Eczane Düzenle" @@ -21944,9 +22511,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Dispenser" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Hastane" @@ -21954,10 +22521,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Hastane Düzenle" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Acil Durum Noktası" @@ -21966,5 +22533,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Acil Durum Noktası Düzenle" @@ -21973,20 +22540,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Nokta Numarası" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Telefon Numarası" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Uluslararası kod kullanın, ör +90-212-67890)" @@ -21994,5 +22561,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Veteriner" @@ -22001,64 +22568,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Veteriner Düzenle" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Yerler" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kıta" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Kıta Düzenle" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Ülke" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Ülke Düzenle" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "İl" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "İl Düzenle" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Bölge" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Bölge Düzenle" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "vilayet" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "vilayet Düzenle" @@ -22066,15 +22633,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Şehir" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Şehir Düzenle" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Mahalle" @@ -22082,10 +22649,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Mahalle Düzenle" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Banliyo" @@ -22093,25 +22660,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Banliyo Düzenle" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Köy" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Köy Düzenle" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Mezra" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Mezra Düzenle" @@ -22119,5 +22686,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Semt" @@ -22125,10 +22692,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Semt Düzenle" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Ada" @@ -22136,10 +22703,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Ada Düzenle" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22147,5 +22714,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22153,5 +22720,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Mağara Girişi" @@ -22159,10 +22726,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Mağara Girişi Düzenle" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Zirve" @@ -22170,10 +22737,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Zirve Düzenle" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Buzul" @@ -22181,10 +22748,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Buzul Düzenle" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Volkan" @@ -22192,70 +22759,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Volkan Düzenle" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Belediye Sınırı" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Milli" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Ülke Sınırı Düzenle" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "İdari" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "İdari Sınırları Düzenle" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Sivil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Sivil Sınırları Düzenle" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Politik Sınır Düzenle" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Milli Park Sınırı Düzenle" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Arazi Kullanımı" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Ağaç" @@ -22264,15 +22831,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Ağaç Düzenle" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botannik İsim" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Orman" @@ -22281,5 +22848,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Orman Düzenle" @@ -22287,17 +22854,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "Kozalaklı Orman" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "yaprak düken orman" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "karışık" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "orman" @@ -22306,14 +22873,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "orman kullanımı düzenle" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "korunacak doğa alanı" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "korunacak doğa alanı düzenle" @@ -22321,25 +22888,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Taşlık Alan" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Taşlık Alan Düzenle" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Çalılık" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Çalılık Düzenle" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Dağ Eteği" @@ -22347,10 +22914,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Dağ Eteği Kullanımı" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Sağlıksız Ağaç" @@ -22358,5 +22925,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Sağlıksız Ağaç Düzenle" @@ -22364,5 +22931,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Çiftlik" @@ -22371,45 +22938,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Çiftlik Kullanımı Düzenle" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Çiftlik Arazisi" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Çiftlik Arazisi Kullanımı Düzenle" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Bağ" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Bağ Kullanımı Düzenle" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Kiralık Tarım Alanı" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Kiralık Tarım Alanı Düzenle" @@ -22417,25 +22984,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Bahçe" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Bahçe Düzenle" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Otlak" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Otlak Kullanım Düzenle" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Köy Yerleşimi" @@ -22443,10 +23010,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Köy Yerleşimi Düzenle" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Genel" @@ -22454,20 +23021,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Genel Düzenle" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Park Düzenle" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "oyun alanı" @@ -22475,5 +23042,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "oyun alanı kullanımı düzenle" @@ -22481,15 +23048,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Yerleşim Alanı" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Yerleşim Alanı Kullanımı Düzenle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Mezarlık" @@ -22497,9 +23064,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Mezarlık Düzenle" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Mezarlık" @@ -22507,39 +23074,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Mezarlık Kullanımı Düzenle" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Perakende" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Perakende Alan Kullanımı Düzenle" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Ticari" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Ticari Alan Kullanımı Düzenle" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Endüstriyel" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Endüstriyel Alan Kullanımı Düzenle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Demiryolu alanı" @@ -22547,15 +23114,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Demiryolu alanı kullanımı düzenle" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Askeri" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Askeri Alan Düzenle" @@ -22563,55 +23130,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "İnşaat Alanı" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "İnşaat Alanı Düzenle" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Ağaçsız_Alan" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Ağaçsız_Alan Kullanımı Düzenle" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Yeşil Alan" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "yeşil Alan kullanımı düzenle" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Toprak Dolum" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Toprak Dolum Alanı Düzenle" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Taşocağı" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "taşocağı Düzenle" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "" @@ -22621,5 +23188,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "" @@ -22628,10 +23195,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "" @@ -22639,5 +23206,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22646,5 +23213,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22652,34 +23219,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "" @@ -22688,15 +23255,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "" @@ -22704,5 +23271,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22711,5 +23278,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22717,5 +23284,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22787,24 +23354,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "bisiklet" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "otobüs" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22857,5 +23424,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22864,13 +23431,13 @@ msgstr "ayak" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -22884,10 +23451,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -22895,31 +23462,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -22928,30 +23495,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23162,130 +23729,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23302,98 +23743,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "kırılmış" @@ -23770,7 +24120,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "araçyolu_hattı" @@ -23834,13 +24184,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "demiryolu" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23856,5 +24285,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23868,5 +24297,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23887,7 +24316,7 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" -msgstr "turningcircle-döner kavşak" +msgstr "döner kavşak" #. color construction @@ -23900,5 +24329,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23913,5 +24342,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "riverbank" @@ -23925,5 +24354,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "akış" @@ -23937,5 +24366,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "iskele" @@ -23957,16 +24386,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "su_kemeri" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24063,4 +24480,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24129,13 +24553,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "insan yapımı" @@ -24181,6 +24605,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24197,7 +24621,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "demiryolu_noktası" @@ -24220,10 +24644,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "başka_demiryolu" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "demiryolu_üzeri" @@ -24259,11 +24683,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "eski_demiryolu" #. color rail +#. #. 1 #. 50000 @@ -24304,6 +24729,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "havayolu" @@ -24317,5 +24742,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -24337,5 +24762,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "havayolu_ağır" @@ -24349,5 +24774,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "hafif_hafif" @@ -24355,4 +24780,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24402,7 +24834,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "havayolu" @@ -24419,5 +24851,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "basit_meydan" @@ -24432,5 +24864,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "orta_meydan" @@ -24445,5 +24877,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "büyük_meydan" @@ -24458,5 +24890,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24471,5 +24903,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "acemiKullanıcı_meydanı" @@ -24484,5 +24916,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "acemiKullanıcı_meydanı" @@ -24602,11 +25034,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "güç" @@ -24620,5 +25052,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "iskele" @@ -24632,5 +25064,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "suhattı" @@ -24758,12 +25190,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "dinlenme_yeri" @@ -24777,5 +25226,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "" @@ -24813,4 +25262,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24829,4 +25294,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24847,8 +25320,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "dinlenme_yeri" @@ -24950,10 +25425,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "tail_trafiği" @@ -25207,5 +25682,5 @@ #. #. -#. +#. #. color health #. @@ -25351,4 +25826,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25368,23 +25851,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "eski_sokak_lambası" @@ -25416,6 +25899,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "su_lambası" @@ -25476,14 +25959,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "sağlık" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25830,5 +26313,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25851,5 +26333,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "alışveriş" @@ -25921,8 +26404,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hotel" @@ -26023,9 +26506,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "turizm" @@ -26113,9 +26596,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "tarihi" @@ -26129,5 +26612,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "taş_ocağı" @@ -26141,5 +26624,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "toprak_doldurma" @@ -26161,5 +26644,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "havza" @@ -26173,5 +26656,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "orman" @@ -26185,5 +26668,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "çiftlik" @@ -26206,5 +26689,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "perakende" @@ -26218,5 +26701,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "endüstri" @@ -26230,5 +26713,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "ağaçsız_alan" @@ -26242,5 +26725,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "yeşil_alan" @@ -26254,5 +26737,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "demiryolu" @@ -26309,7 +26792,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "askeri" @@ -26323,5 +26806,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "mezarlık" @@ -26334,5 +26817,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "zirve" @@ -26347,5 +26830,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "buzul" @@ -26359,5 +26842,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "volkanik" @@ -26412,8 +26895,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "doğal" @@ -26427,5 +26910,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "çalılık" @@ -26439,5 +26922,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "çalılık" @@ -26451,5 +26934,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26463,5 +26946,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "çamur" @@ -26475,5 +26958,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "sahil" @@ -26551,8 +27034,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "rut" @@ -26600,7 +27083,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "sınırlar" @@ -26750,11 +27233,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "yer" @@ -26802,6 +27285,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adres" @@ -27157,63 +27640,61 @@ msgstr "" -#~ msgid "Images for {0}" -#~ msgstr "{0} için görüntüler" - -#~ msgid "Read GPX..." -#~ msgstr "GPX Oku..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Noktalrı için {0} x {1} zaman yok" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Zaman şu noktalar \"{0}\" {1} x {2} için okunamadı" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Zaman damgası okunabilen bir görüntü bulunamadı." - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS başlangıç: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS bitiş: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "şu anki delta: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "zaman dilimi farkı: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} izde var." - -#~ msgid "Sync clock" -#~ msgstr "Saati eşle" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "EXIF zamanı \"{0}\" dosyasında yok." - -#~ msgid "Image" -#~ msgstr "Görüntü" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "GPS ünitesi zamandilimi (resim farkı)" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Girilen zaman ayrıştırılamadı." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Geotagged imajlar" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "AgPifoJ ile görüntü aç..." - -#~ msgid "osmarender options" -#~ msgstr "osmarender seçenekleri" +#~ msgid "Expected closing parenthesis." +#~ msgstr "Parantezlerin kapanması beklenir." + +#~ msgid "" +#~ "I can take a picture of my GPS receiver.
Can this help?" +#~ msgstr "GPS alıcımın resmini çizebilirim.
yardımcı olurmu?" + +#~ msgid "All images" +#~ msgstr "Bütün imajlar" + +#~ msgid "Images with no exif position" +#~ msgstr "exif pozisyonu olmayan imajlar" + +#~ msgid "Not yet tagged images" +#~ msgstr "imaj henuz etiketlenmedi" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPX izi yüklendi" + +#~ msgid "Enable proxy server" +#~ msgstr "Proxy kullan" + +#~ msgid "Anonymous" +#~ msgstr "Anonymous" + +#~ msgid "Proxy server host" +#~ msgstr "Proxy server host" + +#~ msgid "Proxy server port" +#~ msgstr "Proxy server port" + +#~ msgid "Proxy server username" +#~ msgstr "Proxy server kullanıcı_adı" + +#~ msgid "Proxy server password" +#~ msgstr "Proxy server şifresi" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı." + +#~ msgid "Preparing..." +#~ msgstr "Hazırlanıyor..." + +#~ msgid "Uploading..." +#~ msgstr "Yükleniyor..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Hatalı kullanıcı adı veya şifre." + +#~ msgid "Enter Password" +#~ msgstr "Enter Password" + +#~ msgid "Shop" +#~ msgstr "Alışveriş" + +#~ msgid "aqueduct" +#~ msgstr "su_kemeri" #~ msgid "" @@ -27282,7 +27763,4 @@ #~ msgstr "''{1}'' gurubu için ''{0}'' kullan" -#~ msgid "Use preset ''{0}''" -#~ msgstr "''{0}'' ı kullan" - #~ msgid "Edit Properties" #~ msgstr "Özellikleri Değiştir" @@ -27334,4 +27812,55 @@ #~ msgid "name" #~ msgstr "sism" + +#~ msgid "Images for {0}" +#~ msgstr "{0} için görüntüler" + +#~ msgid "Read GPX..." +#~ msgstr "GPX Oku..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Noktalrı için {0} x {1} zaman yok" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Zaman şu noktalar \"{0}\" {1} x {2} için okunamadı" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Zaman damgası okunabilen bir görüntü bulunamadı." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS başlangıç: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS bitiş: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "şu anki delta: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "zaman dilimi farkı: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} izde var." + +#~ msgid "Sync clock" +#~ msgstr "Saati eşle" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "EXIF zamanı \"{0}\" dosyasında yok." + +#~ msgid "Image" +#~ msgstr "Görüntü" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS ünitesi zamandilimi (resim farkı)" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Girilen zaman ayrıştırılamadı." #~ msgid "Login name (email) to the OSM account." @@ -27457,7 +27986,4 @@ #~ msgstr "Elemanın Geçmişi" -#~ msgid "File could not be found." -#~ msgstr "Dosya bulunamadı." - #~ msgid "" #~ "The selected ways have differing relation memberships. Do you still want " @@ -27549,4 +28075,10 @@ #~ msgstr "güncelleme isteğinde hata" +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "AgPifoJ ile görüntü aç..." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotagged imajlar" + #~ msgid "Show Author Panel" #~ msgstr "Yazar Panosunu göster" @@ -27572,4 +28104,7 @@ #~ msgid "Sorry, doesn't work with anonymous users" #~ msgstr "Hata, anonim kullanici ile çalışmaz" + +#~ msgid "osmarender options" +#~ msgstr "osmarender seçenekleri" #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" Index: /applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- /applications/editors/josm/i18n/po/zh_TW.po (revision 19198) +++ /applications/editors/josm/i18n/po/zh_TW.po (revision 19199) @@ -4,10 +4,11 @@ # FIRST AUTHOR , 2009. # Chao-Hsiung Liao , 2009 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-12-02 04:34+0000\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-11 08:24+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Traditional Chinese\n" @@ -16,39 +17,39 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:29+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "建立主視窗中" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "說明" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "忽略不正確的 URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -60,21 +61,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -95,17 +96,8 @@ msgstr "警告" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "忽略格式不良的檔案 URL： \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "無法讀取檔案「{0}」。
錯誤為：
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -113,8 +105,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "無法讀取檔案「{0}」。
錯誤為：
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -122,10 +123,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -137,9 +138,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -148,6 +150,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -202,8 +204,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -271,5 +273,5 @@ msgstr "關於 JOSM" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -278,5 +280,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -285,5 +287,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -292,15 +294,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "繼續" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -309,29 +316,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -348,5 +356,10 @@ msgstr "取消" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "點選以放棄合併節點" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "請至少選擇一個已上傳的節點、路徑或關係。" @@ -362,5 +375,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "合併" @@ -378,15 +391,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "新增節點" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "由經緯度新增節點" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -402,22 +415,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "編輯: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "輸入新節點的座標" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "使用十進位度數" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "負數表示西半球/南半球" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -426,5 +439,5 @@ msgstr "緯度" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -433,28 +446,29 @@ msgstr "經度" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "請輸入有效的緯度範圍 -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "請輸入緯度範圍 -90..90" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "請輸入有效的經度範圍 -180..180" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "請輸入經度範圍 -180..180" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -466,9 +480,9 @@ msgstr "確定" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "關閉此對話盒並建立新的節點" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "關閉此對話盒，不要建立新的節點" @@ -489,18 +503,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -512,5 +526,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -532,6 +546,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -578,5 +592,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "衝突" @@ -613,14 +627,15 @@ msgstr "沒有要縮放的衝突" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -630,21 +645,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "檔案: {0}" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -msgid "There are no open changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "" @@ -725,11 +740,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -807,16 +823,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -852,5 +873,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "重製" @@ -893,10 +914,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "匯出到 GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "匯出資料到 GPX 檔案" @@ -911,12 +932,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -941,8 +962,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -953,10 +974,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -969,17 +990,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1016,22 +1037,27 @@ msgstr "顯示 OSM 路徑、節點或關係的物件資訊。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "連結重疊的區域" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "連接彼此互相重疊的區域" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "請選擇至少一個應該連結的封閉路徑。" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "目前只能連結兩個區域。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "「{0}」尚未封閉因此不能連結。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1044,38 +1070,34 @@ "確定要繼續嗎？" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "如果不確定請放棄" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "請選擇至少一個應該連結的封閉路徑。" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "找不到交叉點。沒有東西變更。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "在所有的交叉點加入節點" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "刪除不屬於內部多邊形一部分的路徑" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "修正關係" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "已連結自我重疊的區域" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "已連結重疊的區域" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1083,33 +1105,33 @@ msgstr "部分屬於關係的一部分的路徑被修改了。請檢查是否造成錯誤。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "輸入所有衝突項目的數值。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "解決衝突" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "修正標籤的衝突" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "從關係中移除元件" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "連結區域：移除短路徑" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "封閉的路徑" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "移除內部路徑的標籤" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "連結區域功能" @@ -1272,5 +1294,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "不能將物件移動到世界外頭" @@ -1350,28 +1372,28 @@ msgstr "下載資料" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "形狀直角化" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "移動節點讓所有角度成為 90 或 270 度" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1380,9 +1402,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1391,16 +1413,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "直角化" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "用量" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "直角化" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1472,18 +1494,18 @@ msgstr "無法重新命名檔案「{0}」" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "反轉路徑" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "反轉所有選取路徑的方向。" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "請選擇至少一條路徑。" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "反轉路徑" @@ -1492,10 +1514,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "存檔" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "儲存現在的資料" @@ -1550,10 +1572,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "另存檔案..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "將目前的資料儲存為新的檔案。" @@ -1594,6 +1616,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1624,5 +1645,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1677,5 +1698,5 @@ msgstr "此路徑不能從選取的節點分割。（提示：選取的節點在路徑的中央。）" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1683,5 +1704,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1691,5 +1712,5 @@ "correct it when necessary." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1723,43 +1744,43 @@ msgstr "這個節點並未黏合到其他項目上。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "這些節點沒有一個黏合到其他項目上。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "這個路徑的節點沒有一個黏合到其他項目上。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "目前的選擇區域不能用於取消黏合。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "選擇其一：" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* 一個有標籤的節點，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* 一個用於多條路徑的節點，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* 一個用於多條路徑或用於那些路徑之一的節點，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* 一個有一或更多節點用於多條路徑的路徑，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "* 一個路徑且其一或多個節點用於多條路徑。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1772,9 +1793,9 @@ "都會被選取。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "取消黏合節點" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1782,5 +1803,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1815,10 +1836,10 @@ msgstr "取消全選（跳出）" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "更新資料" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "從伺服器更新使用中資料圖層的物件。" @@ -1826,53 +1847,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "下載資料" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "找不到目前的資料組合" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "在目前的資料組合中找不到 id {0} 的物件" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "更新選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "從伺服器更新目前選取的物件（重新下載資料）" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "更新選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "沒有選取的物件需要更新。" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "選擇區域是空的" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "更新物件" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "上傳資料" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "將使用中圖層的所有變更上傳至 OSM 伺服器" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1881,5 +1898,5 @@ msgstr "在圖層「{0}」中有未解決的衝突。
您必須先解決它們。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1887,140 +1904,7 @@ msgstr "沒有要上傳的變更。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "沒有要上傳的項目。請先取得一些資料。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "只同步節點 {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "只同步路徑 {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "只同步關係 {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "同步整個資料組" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "選取的衝突" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"上傳失敗，因為伺服器已有您的節點、路徑或關係
的新版" -"本。

請按{0}將整個本地端資料組與伺服器同步。
按" -"{1}則會放棄並繼續編輯。
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"上傳 失敗，因為您使用的
變更組合 {0} 已經在 {1} 被" -"關閉了。
請以新的或已開啟的變更組合再上傳一次。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "變更組合已關閉" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "準備衝突的調解" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "點選以下載節點 {0} 的所有上層路徑" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "點選以取消或恢復編輯地圖" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" -"上傳 已失敗，因為您嘗試刪除的節點 {0} 仍被路徑 {1} 使" -"用中。

請點選 {2} 以下載節點 {0} 的所有上層路徑。
" -"如果有需要 JOSM 會建立衝突項目讓您可以在衝突解決對話盒中處理它。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "節點仍在使用中" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "警告：錯誤標頭「{0}」與預期的模式不符" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "正在更新原型" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "上傳圖層「{0}」的資料" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"警告：物件「{0}」已經在伺服器端被刪除了。現在略過這個物件並重新嘗試上傳。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "物件「{0}」已經被刪除。在上傳中略過此物件。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "正在上傳 {0} 個物件..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "忽略捕捉到的例外，因為上傳已被取消。例外為：{0}" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2052,5 +1936,5 @@ #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25 msgid "Enable/disable rendering the map as wireframe only" -msgstr "" +msgstr "啟用/停用只以線框繪製地圖" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26 @@ -2155,9 +2039,9 @@ msgstr "已下載的 GPX 資料" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "正在下載資料" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2165,5 +2049,5 @@ msgstr "忽略的例外，因為下載已被取消。例外為：{0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "在這個區域中找不到資料。" @@ -2238,7 +2122,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2255,58 +2139,52 @@ "Ctrl：刪除參考的物件。" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "繪製" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "繪製節點" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "模式：繪製焦點" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "已選取" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "不能在這個世界以外的地方加入節點。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "加入節點" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "將節點加入路徑" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "將既存的路徑連接到節點" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "在既存的路徑加入新的節點" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "將節點加入路徑並連接" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "建立新的節點。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "選取游標下的節點。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2314,14 +2192,14 @@ msgstr[0] "插入新的節點到{0} 路徑中。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "從最後的節點開始新的路徑。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "從最後的節點繼續路徑。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "結束繪製。" @@ -2361,18 +2239,19 @@ "將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "選擇" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "選擇、移動和旋轉物件" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2380,17 +2259,17 @@ msgstr[0] "加入並移動虛擬新節點至{0}路徑" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "移動元素" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "移動它們" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "取消移動" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2402,22 +2281,22 @@ "真的要移動它們嗎？" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "永遠進行移動而不要顯示這個對話盒" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "放開滑鼠按鈕以選擇矩形內的物件。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "放開滑鼠按鈕以停止移動。按 Ctrl 則會與最近的節點合併。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "放開滑鼠按鈕以停止旋轉。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2429,5 +2308,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "縮放" @@ -2451,5 +2330,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "搜尋物件。" @@ -2541,7 +2420,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "使用者：... - 所有由某使用者改變的物件" +msgstr "user:anonymous - 所有物件是由匿名使用者所改變的" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2550,8 +2428,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "節點數：... - 含有此數目節點的物件" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "tags:... - 以此數字為標籤的物件 (tags:count 或 tags:min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2559,45 +2447,51 @@ msgstr "tags:... - 以此數字為標籤的物件 (tags:count 或 tags:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "修改過 - 所有改變過的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "選取的 - 所有選取的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "不完整 - 所有不完整的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "未標籤的 - 所有未標籤的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "child expr - 所有物件的子項符合正規表示式的" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent expr - 所有物件父項符合正規表示式的" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "使用 | 或 OR 做邏輯或運算" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "使用 \" 將運算子包覆 (例如當設定鍵含有 :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "使用 ( 和 ) 將正規表示式群組起來" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2605,55 +2499,55 @@ msgstr "過濾條件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "搜尋" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "送出過濾條件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "開始搜尋" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "找不到「{0}」的符合項" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "搜尋「{0}」的結果沒有任何項目可自選擇區域移除" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "在選擇區域中搜尋不到「{0}」" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "找到 {0} 個符合項" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2666,40 +2560,43 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "樣式語法錯誤：在 {1} 中的樣式 {0} 是無效的！" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "不明的原型類型：{0}。允許的數值為 node、 way 或 relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "未預期的記號：{0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "沒有 or 所需的引數。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "沒有 not 所需的引數。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "需要關閉括弧。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "沒有 or 所需的引數。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "標籤運算子的參數編號錯誤。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2710,9 +2607,9 @@ "tags:1 或 tags:2-5" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "給 nodes 運算子錯誤的參數數量。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2723,7 +2620,12 @@ "nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "id 運算子數值錯誤：{0}。應使用數字。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "id 運算子數值錯誤：{0}。應使用數字。" @@ -2757,37 +2659,31 @@ msgstr "與伺服器連線時發生錯誤。" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "目前的變更數超過最大值。變更的數量，目前為 {0}，最大值為 {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "警告：自動截短在已刪除物件 {1} 上標籤「{0}」的數值" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" +"在物件 {1} 上的標籤「{0}」數值的長度超過最大值。允許的長度為 {2}。數值的長度" +"為 {3}。" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "違反先決條件" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "路徑 {1} 中的 {0} 個節點超過最大值。允許的節點數為 {2} 個" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "違反 API 能力" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "違反先決條件" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "路徑 {1} 中的 {0} 個節點超過最大值。允許的節點數為 {2} 個" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2898,5 +2794,5 @@ msgstr "將 {2} {3} 設定 {0}={1}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2909,7 +2805,9 @@ "conflict can't be added." msgstr "" +"圖層「{0}」已有衝突發生於原型
「{1}」。
這個衝突不能被加入。" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "雙重衝突" @@ -2920,5 +2818,5 @@ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitive ''{1}''." -msgstr "" +msgstr "警告：圖層「{0}」已不存在。不能移除原型「{1}」的衝突。" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -3005,4 +2903,19 @@ msgstr "解決 {0} 刪除狀態的衝突" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3112,5 +3025,5 @@ msgstr "是否接受？" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3194,15 +3107,15 @@ msgstr "預期參數「{0}」> 0.0，卻收到 {1}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "警告：將偏好設定固定為「{0}」失敗" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "設定檔案第 {0} 行格式不良" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3211,5 +3124,5 @@ msgstr "警告：初始化偏好設定失敗。偏好設定目錄「{0}」不是一個目錄。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3218,5 +3131,5 @@ msgstr "初始化偏好設定失敗。
偏好設定目錄「{0}」不是一個目錄。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3225,5 +3138,5 @@ msgstr "警告：初始化偏好設定失敗。無法建立缺少的偏好設定目錄：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3232,5 +3145,5 @@ msgstr "初始化偏好設定失敗。
無法建立缺少的偏好設定目錄：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3238,5 +3151,5 @@ msgstr "警告：缺少偏好設定檔案「{0}」。正在建立預設的偏好設定檔案。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3245,5 +3158,5 @@ msgstr "警告：以預設的偏好設定檔案取代現有的偏好設定檔案「{0}」。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3252,5 +3165,5 @@ msgstr "初始化偏好設定失敗。
無法將偏好設定重設為預設值：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3261,5 +3174,5 @@ "偏好設定檔案。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3268,10 +3181,10 @@ msgstr "警告：初始化偏好設定失敗。無法將偏好設定重設為預設值：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "錯誤：在書籤檔案「{1}」中有未預期的行「{0}」" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3279,24 +3192,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "偏好設定儲存於 {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "無法上傳偏好設定。理由：{0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "無法從伺服器載入偏好設定。" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "錯誤：伺服器的書籤清單中有未預期的行「{0}」" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3305,5 +3218,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3332,5 +3245,5 @@ msgstr "警告：缺少修訂版檔案「/REVISION」。" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3352,31 +3265,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "南" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "北" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "西" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "東" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "變更組合 {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3384,5 +3290,5 @@ msgstr "無法將原型 {0} 加入資料組合，因為它已在其中" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3395,26 +3301,26 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "缺少 id {0} 路徑的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 #, java-format msgid "Missing merge target for node with id {0}" msgstr "缺少 id {0} 節點的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 #, java-format msgid "Missing merge target for object with id {0}" msgstr "缺少 id {0} 物件的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "缺少 id {0} 關係的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3423,5 +3329,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3433,5 +3339,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3439,25 +3345,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "H" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "文字" #. column header: apply filter for children -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "C" msgstr "C" #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "I" msgstr "I" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "M" @@ -3465,43 +3371,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "R" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "A" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "D" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "預期 ID >= 0。收到 {0}。" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "ID = 0 的原型不能為不可視。" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "預期 ID > 0。收到 {0}。" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "預期版本 > 0。收到 {0}。" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "預期參數「{0}」> 0，卻收到 {1}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3509,5 +3427,5 @@ msgstr "不能合併，因為加入的原型中一個是新的，另一個不是" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3535,10 +3453,6 @@ msgstr "標籤集無法套用到原型上，因為有鍵值含有多個數值。" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "發現同一 uid 的使用者但姓名卻不同" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3546,7 +3460,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3561,5 +3475,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3577,146 +3491,138 @@ msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "區域類型的路徑並未封閉。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "多邊形路徑「{0}」並未封閉。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "關係中已刪除的成員「{0}」。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "路徑「{0}」少於兩個節點。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "找到一個以上「從」路徑。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "找到一個以上「到」路徑。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "找到一個以上的「經過」。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "不明的角色「{0}」。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "「{0}」的不明成員類型。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "找不到「從」路徑。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "找不到「到」路徑。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "找到一個以上「經過」路徑。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "「從」路徑沒有開始或結束於「經過」節點。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "「到」路徑沒有開始或結束於「經過」節點。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "「從」路徑沒有開始或結束於「經過」路徑。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "「到」路徑沒有開始或結束於「經過」路徑。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "找不到限制 {0} 的樣式" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "路徑「{0}」和「{1}」之間的十字路。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "內部路徑「{0}」在外。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "路徑「{1}」沒有有用的角色「{0}」。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "多邊形中有非-路徑「{0}」。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "多邊形「{0}」沒有外部路徑。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "內部路徑「{0}」的樣式等同多邊形。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "外部路徑「{0}」的樣式不符。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "未上標籤的" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "文字" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "區域文字" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "錯誤：{0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "警告：{0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "不使用" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "已選取" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3724,6 +3630,6 @@ msgstr[0] "節點" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3731,7 +3637,8 @@ msgstr[0] "路徑" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3739,21 +3646,37 @@ msgstr[0] "關係" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "未上標籤的路徑" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "不完整的路徑" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "背景" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "突顯" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "未上標籤的" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "文字" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "區域文字" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3770,5 +3693,5 @@ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot load " "NTF<->RGF93 grid" -msgstr "" +msgstr "警告：無法開啟資源「/data/{0}」的輸入串流。不能載入 NTF<->RGF93 格線" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137 @@ -3895,5 +3818,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "鐵路" @@ -3909,7 +3832,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3923,4 +3846,10 @@ msgstr[0] "{0} 成員" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "變更組合 {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3952,6 +3881,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "衝突" @@ -3965,7 +3894,7 @@ msgstr "物件已刪除" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4048,74 +3977,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "使用者名稱" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "密碼" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "用法" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "選項" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "顯示此說明訊息" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "標準 unix 幾何引數" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "下載此綁定方塊" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "於此 url 下載位置 (具有 lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "開啟檔案(若為 .gpx 則是原始 gps)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "下載綁定方塊做為原始 gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "選取指定的搜尋" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "以最大化模式啓動" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "重設偏好設定為預設值" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "設定語言。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "選項提供為 Java 系統屬性" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "改變所有使用者設定值的資料夾" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4126,9 +4055,9 @@ " Java 選項來增加分配記憶體的最大容量" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "範例" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4138,36 +4067,36 @@ "--selection 前載入某些資料" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "要取代 --download= 可以指定 osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "使用更新後的外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "載入較早的外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "設定預設值" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "正在載入外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "偏好設定 {0} 已經被移除，因為它已不再使用了。" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "檔案" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4182,22 +4111,22 @@ msgstr "編輯" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "檢視" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "工具" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "預設組合" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4205,5 +4134,5 @@ msgstr "選單：{0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "音效" @@ -4282,13 +4211,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "使用者：" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "圖層不在清單中。" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4321,5 +4251,5 @@ msgstr "初始化" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4329,6 +4259,6 @@ "strong>。" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4339,5 +4269,5 @@ "strong>。" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4348,5 +4278,5 @@ "strong>。" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4354,25 +4284,25 @@ msgstr[0] "正在刪除 {0} 個物件" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "正在刪除物件" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "要刪除" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "從關係" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4380,9 +4310,9 @@ msgstr "角色" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "點選以關閉此對話盒並從關係中移除此物件" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "點選以關閉此對話盒並放棄刪除此物件" @@ -4414,11 +4344,11 @@ msgstr "角色 {0} 沒有參與比較配對 {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "屬性" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4427,6 +4357,6 @@ msgstr "標籤" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4434,6 +4364,6 @@ msgstr "節點" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4441,40 +4371,40 @@ msgstr "成員" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "沒有待解決的標籤衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "標籤({0} 衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} 個標籤衝突待解決" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "節點(已解決)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "合併的節點清單已凍結。這個路徑的節點清單中沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "節點(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "這個路徑的節點清單中待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "成員(已解決)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4482,21 +4412,21 @@ msgstr "合併的節點清單已凍結。這個關係的成員清單中沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "成員(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "這個關係的成員清單中待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "屬性(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "待解決的屬性衝突" @@ -4528,22 +4458,22 @@ msgstr "在清單中找不到項目 {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "鎖定捲動" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "比較 " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "我的版本" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "我的資料組合裡元件的清單，例如本地端資料組合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4551,5 +4481,5 @@ msgstr "合併的版本" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4557,30 +4487,30 @@ msgstr "合併元件的清單。它們會在合併決定被接受時取代我的元件。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "他們的版本" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "他們的資料組合裡元件的清單，例如伺服器資料組合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> 頂端" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "將我選取的節點複製到合併節點清單的開頭" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> 底部" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "將我選取的元件複製到合併元件清單的結尾" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4588,5 +4518,5 @@ msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之前" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4594,14 +4524,14 @@ msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之後" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "將他們選取的元件複製到合併元件清單的開頭" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "將他們選取的元件複製到合併元件清單的結尾" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4609,5 +4539,5 @@ msgstr "將他們選取的元件複製到合併元件清單的第一個選取元件之前" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4615,23 +4545,23 @@ msgstr "將他們選取的元件複製到合併元件清單的第一個選取元件之後" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "上" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "將選取的元件向上移動一個位置" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "下" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "將選取的項目向下移動一個位置" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4642,27 +4572,27 @@ msgstr "移除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "從合併元件的清單移除選取的項目" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "凍結" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "凍結" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "凍結合併元件目前的清單" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "解除凍結" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "將合併元件的清單解除凍結並開始合併" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4671,5 +4601,5 @@ msgstr "點選 {0} 開始合併我和他們的項目" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4678,5 +4608,5 @@ msgstr "點選 {0} 結束合併我和他們的項目" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4684,5 +4614,5 @@ msgstr[0] "我的版本 ({0} 個項目)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4690,5 +4620,5 @@ msgstr[0] "合併的版本 ({0} 個項目)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4696,5 +4626,5 @@ msgstr[0] "他們的版本 ({0} 個項目)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4704,5 +4634,5 @@ msgstr "可調整的 {0} 尚未設定。不能在同步調整中設定參與。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4944,10 +4874,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4957,10 +4887,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5045,9 +4975,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "接受" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5055,6 +4985,6 @@ msgstr "沒有" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "全部" @@ -5118,5 +5048,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 msgid "Conflicts in pasted tags" -msgstr "" +msgstr "衝突發生於貼上的標籤" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 @@ -5142,7 +5072,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5151,6 +5081,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5237,12 +5167,15 @@ "original node in the membership." msgstr "" +"合併的節點是一或多個關係的成員。請決定您要 保留 目標節" +"點的這些成員屬性或是要 移除 它們。
預設值是 保留" +" 它們：目標節點將會取代原本成員中節點的位置。" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144 msgid "Apply this role to all members" -msgstr "" +msgstr "將這個角色套用到所有成員中" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51 msgid "Orig. Way" -msgstr "" +msgstr "原路徑" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 @@ -5257,4 +5190,56 @@ msgid "Show tags with conflicts only" msgstr "只顯示有衝突的標籤" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "刪除選擇的物件" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "變更組合 {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "下載" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "從 OSM 主機下載圖資" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "刪除選擇的物件" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "顯示資訊" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "開啓選取的關係編輯器" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -5269,12 +5254,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5292,18 +5277,18 @@ msgstr "指令堆疊：{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "調解衝突。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "開啟上列清單所有選取的項目的合併對話盒。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5311,25 +5296,25 @@ msgstr "在地圖上設定選取的元件為上列清單中選取的項目。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "取消衝突決議並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "接受已解決的衝突並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "套用解決方案" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "強制關閉" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "繼續解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5341,26 +5326,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "衝突尚未完全調解" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "解決衝突" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "調解「{0}」的衝突" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "過濾物件並隱藏/停用它們。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5371,41 +5356,41 @@ msgstr "加入" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "加入過濾條件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "編輯過濾條件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "刪除過濾條件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "將過濾條件上移。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "將過濾條件下移。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "啟用過濾條件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "隱藏元素" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "也套用到子項目" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "反轉過濾條件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "過濾條件模式" @@ -5444,5 +5429,5 @@ msgstr "顯示選取物件的歷史紀錄。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "對話盒尚未建立。先呼叫 createInstance()" @@ -5457,34 +5442,34 @@ msgstr "開啟所有載入圖層的清單。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "刪除選取的圖層。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "顯示/隱藏" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "切換選取的圖層可見性狀態。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "使用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "使用選取的圖層" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "將這個圖層合併至另一個圖層" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "將選取的圖層上移一列。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "將選取的圖層下移一列。" @@ -5494,5 +5479,174 @@ msgstr "關於圖層的資訊" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "開啓所有關係的清單。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "關係：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "開啓選取的關係編輯器" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "刪除選取的關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "建立新的關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "建立這個關係的複本並且在另一個編輯器視窗開啟它" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "將目前的選擇區域設定到選取關係的清單" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "選擇所有已選取關係的成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "選擇成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "下載已選取關係的所有成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "下載成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "目前的選擇區域" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "開啓選擇區域清單視窗。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "縮放至選取的元件" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "縮放至選擇區域" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Sel.: Rel.:{0} / 路徑:{1} / 節點:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "選擇區域" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "選擇區域：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "解鎖面板" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "點選以最小化/最大化面板內容" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "作者" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "開啟在編輯選取物件的使用者的清單。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} 作者" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "選擇由這個使用者提交的原型" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "啟動瀏覽器顯示關於此使用者的資訊" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "警告：只會顯示 {1} 個已選取使用者的前 {0} 位" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "無法建立 URL，因為編碼「{0}」在此系統中
無法使用。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "缺少編碼" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "作者" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# 物件" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "不完整" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "封閉路徑" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "下載資料" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5500,22 +5654,22 @@ msgstr[0] "這會改變 {0} 個物件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "空白的數值代表刪除該標籤。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "<不同>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "是否改變數值？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5523,5 +5677,5 @@ msgstr[0] "改變屬性至 {0} 個物件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5529,245 +5683,91 @@ msgstr[0] "這會改變 {0} 個物件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "請選擇一個設定鍵" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "請選擇一個數值" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "請選擇您要改變屬性的物件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "屬性/成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "選取物件的屬性。" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "加入屬性" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "屬性：{0} / 成員：{1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "屬性 / 成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "改變關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "自關係中刪除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "確定要刪除關係 {0} 的選擇區域？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "刪除所有物件中選取的設定鍵" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "删除屬性" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "將新的設定鍵/數值配對加入到所有的物件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "編輯所有物件選取設定鍵的數值" -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "關係" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "開啓所有關係的清單。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "關係：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "開啓選取的關係編輯器" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "刪除選取的關係" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "建立新的關係" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "建立這個關係的複本並且在另一個編輯器視窗開啟它" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "將目前的選擇區域設定到選取關係的清單" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "選擇所有已選取關係的成員" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "選擇成員" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "下載已選取關係的所有成員" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "下載成員" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "目前的選擇區域" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "開啓選擇區域清單視窗。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "縮放至選取的元件" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "縮放至選擇區域" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Sel.: Rel.:{0} / 路徑:{1} / 節點:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "選擇區域" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "選擇區域：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "解鎖面板" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "點選以最小化/最大化面板內容" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "作者" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "開啟在編輯選取物件的使用者的清單。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} 作者" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "選擇由這個使用者提交的原型" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "顯示資訊" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "作者" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# 物件" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 msgid "Edit the relation the currently selected relation member refers to." -msgstr "" +msgstr "編輯目前選取的關係成員所參照的關係。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220 msgid "Download all child relations (recursively)" -msgstr "" +msgstr "下載所有子關係（遞迴式）" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 msgid "Download All Children" -msgstr "" +msgstr "下載所有子項目" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241 msgid "Download selected relations" -msgstr "" +msgstr "下載選取的關係" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245 msgid "Download Selected Children" -msgstr "" +msgstr "下載選取的子項目" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290 @@ -5776,10 +5776,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:49 msgid "Download relation members" -msgstr "" +msgstr "下載關係成員" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 msgid "Conflicts in data" -msgstr "" +msgstr "衝突發生於資料" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342 @@ -5788,9 +5788,9 @@ "The child relation
{0}
is deleted on the server. It can't be " "loaded" -msgstr "" +msgstr "子關係
{0}
已在伺服器中刪除。它已無法載入" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351 msgid "Relation is deleted" -msgstr "" +msgstr "關係已刪除" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408 @@ -5798,5 +5798,5 @@ #, java-format msgid "Downloading relation {0}" -msgstr "" +msgstr "正在下載關係 {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427 @@ -5806,46 +5806,43 @@ #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" +msgstr "警告：忽略例外，因為工作已取消。例外：{0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "下載關係中所有不完整的路徑和節點" +msgstr[0] "正下載關係「{1}」的 {0} 不完整子項目" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "下載位置" +msgstr "下載關係" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "在關係「{2}」設定 {0}={1}" +msgstr "({0}/{1}: 正在下載關係「{2}」..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 msgid "Tags and Members" -msgstr "" +msgstr "標籤與成員" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Parent Relations" -msgstr "" +msgstr "上層關係" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 msgid "Child Relations" -msgstr "" +msgstr "子關係" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "套用解決方案" +msgstr "套用角色：" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "輸入所有關係成員的角色" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "輸入一個角色並將它套用至選取的關係成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5853,15 +5850,17 @@ "
How do you want to proceed with circular dependencies?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +"在這個關係中至少有一個成員參照到
這個關係自身。
這樣會建立循環相" +"依關係，但是不建議這麼做。
您要如何處理循環相依關係？" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +msgstr "移除它們，清除關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +msgstr "忽略它們，保持關係原貌" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5870,10 +5869,12 @@ "html>" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +"這個關係已經有一或多個成員參照到
原型「{0}」

您確定要加入另一" +"個關係成員嗎？" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +msgstr "多個成員參照到同一原型" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5882,43 +5883,45 @@ "''{0}''." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +"您正試著將關係加入它自己。

這樣會建立循環參照，因此不建議這麼" +"做。
正略過關係「{0}」。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +msgstr "將目前資料組合中選取的所有原型加到第一個成員之前" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +msgstr "將目前資料組合中選取的所有原型加到最後一個成員之後" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " "member" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +msgstr "將目前資料組合中選取的所有原型加到第一個選取的成員之前" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " "member" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +msgstr "將目前資料組合中選取的所有原型加到最後一個選取的成員之後" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 msgid "Remove all members referring to one of the selected primitives" -msgstr "" +msgstr "移除所有參照到選取原型其中之一的成員" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +msgstr "關係編輯器：移除已選取的" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +msgstr "選取參照到目前選取範圍的關係成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5927,70 +5930,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +msgstr "選擇已選取關係成員的原型" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +msgstr "排序關係成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "運動" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "排序" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +msgstr "關係編輯器：排序" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "將目前選取的成員上移" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +msgstr "關係編輯器：上移" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "將目前選取的成員下移" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +msgstr "關係編輯器：下移" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" -msgstr "" +msgstr "將目前選取的成員從這個關係中移除" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +msgstr "關係編輯器：移除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +msgstr "刪除目前編輯的關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +msgstr "是，建立衝突並關閉" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +msgstr "點選以建立衝突項目並關閉這個關係編輯器" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +msgstr "否，繼續編輯" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +msgstr "點選以返回關係編輯器並繼續編輯關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5998,10 +6000,12 @@ "conflict and close the editor?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +"這個關係已經在此編輯器以外的地方被改變了。
您不能套用自己的變更後繼" +"續編輯。

是否要建立衝突並關閉編輯器？" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +msgstr "衝突發生於資料" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6009,50 +6013,50 @@ "
Please resolve this conflict first, then try again." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +"圖層「{0}」已經有衝突於原型
「{1}」。
請先調解這個衝突，然後再試" +"一次。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +msgstr "套用目前的更新" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +msgstr "套用更新並關閉此對話盒" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +msgstr "取消更新並關閉此對話盒" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +msgstr "加入空的標籤" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "下載成員" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "下載所有未完成的成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "下載成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +msgstr "關係編輯器：下載成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "下載成員" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "下載選取的未完成成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgstr "為選取的成員設定角色" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +msgstr "套用角色" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6061,45 +6065,47 @@ "new role?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +"您正在 {0} 原型上設定空角色。
這個動作等於要刪除這些原型的角色。
" +"您確定要套用此新角色嗎？" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +msgstr "是，套用它" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgstr "否，不套用" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +msgstr "確認空白角色" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" -msgstr "" +msgstr "編輯目前選取關係成員所參照的關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "縮放至" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +msgstr "縮放至第一個選取成員所參照的物件" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +msgstr "縮放已停用，因為這個關係的圖層未使用" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" -msgstr "" +msgstr "縮放已停用，因為尚未選取成員" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" +msgstr "參照到" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 msgid "Download referring relations" -msgstr "" +msgstr "下載參照的關係" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81 @@ -6201,10 +6207,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6214,5 +6220,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6296,9 +6302,4 @@ msgid "Download Area" msgstr "下載區域" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "下載" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6597,6 +6598,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6609,6 +6608,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6879,4 +6876,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7099,5 +7100,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7140,116 +7141,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "名稱" @@ -7273,15 +7274,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "類型" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7452,10 +7453,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7463,5 +7464,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7469,9 +7470,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7586,6 +7587,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "不明" @@ -7607,13 +7608,13 @@ msgstr "匿名" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7648,4 +7649,129 @@ msgstr "版本" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "只同步節點 {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "只同步路徑 {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "只同步關係 {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "同步整個資料組" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"上傳失敗，因為伺服器上的節點、
路徑或關係比您的版本" +"更新。
這個衝突是由於 {0} ( id {1}) 造" +"成，
伺服器的版本為 {2}，您的版本為 {3}。

請點選 {4} 只同步有衝突的原型。
點選 {5} 會與伺服器同步整個" +"本地端資料組合。
點選 {6} 則會放棄並繼續編輯。
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "選取的衝突" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"上傳失敗，因為伺服器已有您的節點、路徑或關係
的新版" +"本。

請按{0}將整個本地端資料組與伺服器同步。
按" +"{1}則會放棄並繼續編輯。
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"上傳 失敗，因為您使用的
變更組合 {0} 已經在 {1} 被" +"關閉了。
請以新的或已開啟的變更組合再上傳一次。" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "變更組合已關閉" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "準備衝突的調解" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "點選以下載節點 {0} 的所有上層路徑" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "點選以取消或恢復編輯地圖" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" +"上傳 已失敗，因為您嘗試刪除的節點 {0} 仍被路徑 {1} 使" +"用中。

請點選 {2} 以下載節點 {0} 的所有上層路徑。
" +"如果有需要 JOSM 會建立衝突項目讓您可以在衝突解決對話盒中處理它。" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "節點仍在使用中" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "警告：錯誤標頭「{0}」與預期的模式不符" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "提供關於您所上傳變更的簡短註解：" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7664,39 +7790,148 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "上傳變更" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "正在關閉變更組合..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "儲存使用者與密碼(未加密)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "請輸入使用者名稱" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "請輸入您的軌跡的標籤。" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "警告：密碼是以未加密的方式傳輸。" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "田徑" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "到達交會點" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7763,17 +7998,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7786,9 +8021,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7802,9 +8037,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7819,50 +8054,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "放棄修改且離開" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7870,5 +8105,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7941,40 +8176,378 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "更新物件" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "設定值" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "進階" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "設定可用的外掛程式。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "上傳圖層「{0}」的資料" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "上傳變更" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, fuzzy, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +"請確認是否從 {1} 個關係中移除 {0} 個物件。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "上傳圖層「{0}」的資料" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +#, fuzzy +msgid "Click to return to the Upload Dialog" +msgstr "點選以關閉對話盒" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "關於" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "點選以放棄合併節點" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "沒有選取的物件需要更新。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "變更組合已關閉" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"警告：物件「{0}」已經在伺服器端被刪除了。現在略過這個物件並重新嘗試上傳。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "物件「{0}」已經被刪除。在上傳中略過此物件。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "正在上傳 {0} 個物件..." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "忽略捕捉到的例外，因為上傳已被取消。例外為：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "請選擇要刪除的列。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "要加入的物件：" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "要編輯的物件：" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "要刪除的物件：" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7983,5 +8556,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -7990,5 +8563,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -7997,208 +8570,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "上傳變更" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "請先輸入想要的坐標。" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "提供關於您所上傳變更的簡短註解：" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "警告：將偏好設定固定為「{0}」失敗" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "錯誤的要求" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} 公尺" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "請輸入過濾條件字串。" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps 點" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "自訂線條的繪製" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "使用全域設定值。" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "在這個圖層的各點之間繪出線條。" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "在這個圖層的各點之間不要繪出線條。" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "選擇線條繪製選項" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8206,5 +8608,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8213,5 +8615,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8293,5 +8695,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "描述" @@ -8321,10 +8723,10 @@ msgstr[0] "{0} 航點" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "轉換為資料圖層" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8334,12 +8736,12 @@ "軌跡，請看這裡：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8348,29 +8750,29 @@ msgstr "轉換自：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "從 OSM 沿這條軌跡下載" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "下載這裡面的每個物件：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} 公尺" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "每個要求最大區域：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} 平方公里" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8380,9 +8782,9 @@ "這個動作會發出 {0} 個
個別的下載要求。您是否希望
繼續？" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8390,5 +8792,5 @@ msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8396,23 +8798,23 @@ msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "資料圖層 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "超出下載的區域" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "版本 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8421,5 +8823,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8433,5 +8835,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8444,11 +8846,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8457,36 +8859,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} 組成：" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "取消設定" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "API 版本： {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "轉換為 GPX 圖層" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8494,5 +8896,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8501,10 +8903,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" msgstr[0] "點" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8512,5 +8914,5 @@ msgstr[0] "有 {0} 個點的軌跡" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8518,5 +8920,5 @@ msgstr[0] "{0} 由 {1} 軌跡組成" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8524,24 +8926,24 @@ msgstr[0] "{0} 點" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX 檔案 (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "檔案 {0} 已經以「{1}」的名稱載入了。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "當解析 {0} 時發生錯誤。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "不能讀取 \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8552,34 +8954,34 @@ "據您讀取到的相片時刻並選擇時區

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "相片時刻 (取自 exif):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Gps 時刻（自上列相片讀取）： " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "我所在的時區： " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "沒有日期" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "開啟其他相片" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "從 GPS 接收器的相片同步時間" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8589,151 +8991,117 @@ "請使用要求的格式" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "無效的日期" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "<尚未載入 GPX 軌跡>" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX 軌跡： " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "開啟另一個 GPX 軌跡" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "自動猜測" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "更新位置： " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "時區： " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "位移：" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "我的 GPS 接收器可以拍照。
這樣有幫助嗎？" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "更新位置： " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "所有圖片" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "圖片沒有 exif 位置" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "尚未加上標籤的圖片" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "尚未選擇！" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "已比對 {1} 張相片中的 {0} 張到 GPX 軌跡。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "將圖片與 GPX 軌跡關聯" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "關聯" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "自動猜測" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "您應該選擇一個 GPX 軌跡" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "沒有選取的 GPX 軌跡" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"分析時區時發生錯誤。\n" -"預期的格式：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 msgid "Invalid timezone" msgstr "無效的時區" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"在分析補償時發生錯誤。\n" -"預期的格式：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 msgid "Invalid offset" msgstr "無效的移位" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX 軌跡已載入" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "選取的相片未包含時刻資訊。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "相片未包含時刻資訊" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX 軌跡沒有時刻資訊" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "正在追蹤" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 #, java-format msgid "Timezone: {0}" msgstr "時區：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 #, java-format msgid "Minutes: {0}" msgstr "分鐘：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 #, java-format msgid "Seconds: {0}" msgstr "秒鐘：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "已比對 {1} 張相片中的 {0} 張到 GPX 軌跡。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" msgstr "({0} 天的時間差異)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "在軌跡與相片間的補償：{0}分 {1}秒" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8741,120 +9109,207 @@ msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 msgid "Matching photos to track failed" msgstr "比對相片至軌跡失敗" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 msgid "Adjust timezone and offset" msgstr "調整時區並補償" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "預設值" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "選取的相片未包含時刻資訊。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "相片未包含時刻資訊" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX 軌跡沒有時刻資訊" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 +msgid "You should select a GPX track" +msgstr "您應該選擇一個 GPX 軌跡" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 +msgid "No selected GPX track" +msgstr "沒有選取的 GPX 軌跡" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"分析時區時發生錯誤。\n" +"預期的格式：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"在分析補償時發生錯誤。\n" +"預期的格式：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "從 EXIF 中解出 GPS 位置" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "開始掃描目錄" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "讀取相片..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "正在讀取 {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "無法取得目錄 {0} 的路徑\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "正在掃描目錄 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "在目錄 {0} 找到空的檔案\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "從目錄 {0} 取得檔案時發生錯誤\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "有 Geotag 的圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "關聯到 GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" msgstr[0] "圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "已發現 {0} 具有 GPS 標籤。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "永遠進行移動而不要顯示這個對話盒" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "找不到檔案" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "沒有圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "正在載入 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "檔案 {0} 有錯誤" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "顯示有 Geotag 的相片" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "上一幅" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "上一幅圖片" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "切換：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "從圖層移除相片" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "自關係中刪除" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "下一幅" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "下一幅圖片" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "置中檢視" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "最適與 1:1 縮放" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8865,5 +9320,5 @@ "高度： {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8958,4 +9413,12 @@ msgid "Error displaying URL" msgstr "在顯示 URL 時發生錯誤" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9168,7 +9631,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "全部" @@ -9237,6 +9699,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "單車" @@ -9622,31 +10084,92 @@ msgstr "無法使用投影法 {0}。改用麥卡托投影" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "啟用代理伺服器" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "匿名" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "醫院" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "連接埠：" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "密碼" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "代理伺服器設定值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "代理伺服器主機" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "代理伺服器連接埠" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "代理伺服器使用者名稱" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "代理伺服器密碼" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "OSM 伺服器 (REST API) 的基礎 URL" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "OSM 帳號的登入名稱 (e-mail)。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "OSM 帳號的登入密碼。留空則不會儲存任何密碼。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "基礎伺服器 URL" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "OSM 使用者名稱 (e-mail)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM 密碼" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"警告：此密碼是以純文字的方式儲存於偏好設定檔案中。
密碼也是在 URL 中" +"以純文字的方式傳送到伺服器。
請勿使用重要的密碼。" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9935,5 +10458,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9942,13 +10465,13 @@ msgstr[0] "移除 {0} 個物件之多的舊設定鍵" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "加入新標籤" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "刪除在標籤表中的選擇區域" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9956,18 +10479,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "額外屬性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "封閉路徑" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "不明的類型：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9978,16 +10501,16 @@ msgstr "無法讀取標籤預設組合來源：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "分析 {0} 時發生錯誤： " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "類型 {0} 的元件已支援。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -9995,18 +10518,18 @@ msgstr[0] "改變 {0} 個物件" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "尚未選擇！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "選擇區域不合適！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "套用預設組合" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "改變屬性" @@ -10035,4 +10558,11 @@ msgstr "正在下載點 {0} 到 {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10048,12 +10578,67 @@ msgstr "在變更組合中衝突的錯誤標頭有未預期的的格式。卻收到「{0}」" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "空指標例外(NullPointerException)，可能是缺少標籤。" - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "正在準備資料..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "未預期的欄號 {0}" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10154,16 +10739,16 @@ msgstr "分析錯誤：gpx 文件有無效的文件結構" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10173,40 +10758,40 @@ msgstr "正在下載 OSM 資料..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "伺服器對 id {0} 傳回回應代碼 404。正在略過它。" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10214,9 +10799,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "正在下載點 {0} 到 {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10253,32 +10839,32 @@ msgstr "NMEA 匯入失敗！" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, fuzzy, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." msgstr "缺少偏好設定「{0}」。不能初始化 OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "這個版本的 JOSM 與設定的伺服器。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." -msgstr "它支援 0.5 和 0.6 版的協定，但是該伺服器說它支援 {0} 到 {1}。" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "使用 {1} 版協定建立與 {0} 的連線" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "伺服器回覆未預期的 id 格式，取得「{0}」" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10286,66 +10872,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "正在關閉變更組合..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "沒有需要進行差異上傳的變更組合。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "正在準備..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "正在上傳..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "正在準備資料..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "正在上傳 {0} 個物件..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10372,4 +10969,14 @@ msgid "Invalid bz2 file." msgstr "無效的 bz2 檔案。" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10380,5 +10987,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10405,5 +11012,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10411,5 +11018,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10422,5 +11029,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10431,59 +11038,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "不正確的密碼或使用者名稱。" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "警告：密碼是以未加密的方式傳輸。" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "儲存使用者與密碼(未加密)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "輸入密碼" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "登入" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "OSM 伺服器 (REST API) 的基礎 URL" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "OSM 帳號的登入名稱 (e-mail)。" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "OSM 帳號的登入密碼。留空則不會儲存任何密碼。" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "基礎伺服器 URL" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "OSM 使用者名稱 (e-mail)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM 密碼" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"警告：此密碼是以純文字的方式儲存於偏好設定檔案中。
密碼也是在 URL 中" -"以純文字的方式傳送到伺服器。
請勿使用重要的密碼。" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10573,5 +11127,12 @@ msgstr "檔案「{0}」不存在" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10580,38 +11141,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10619,19 +11180,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "不完整的 > 規格，ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "不合法的物件，id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10641,8 +11202,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10652,25 +11213,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "參數「index」有未預期的數值。得到 {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10678,5 +11255,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10685,5 +11262,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10691,5 +11268,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10698,13 +11275,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "準備 OSM 資料..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10727,21 +11304,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "正在關閉變更組合..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "({0}/{1}: 正在下載關係「{2}」..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10760,7 +11348,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "參數「index」有未預期的數值。得到 {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10769,9 +11357,5 @@ msgstr "開啟 API {0} 連線失敗" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10822,7 +11406,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "參數「index」有未預期的數值。得到 {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 @@ -10830,12 +11414,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format msgid "({0}/{1}) Uploading {2} objects..." -msgstr "正在上傳 {0} 個物件..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "正在上傳資料 ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "已刪除或移動的原型" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10877,7 +11466,7 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "刪除 {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 @@ -11018,9 +11607,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "沒有描述可用" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "更多詳細資料" @@ -11151,4 +11740,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "參數「index」有未預期的數值。得到 {0}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "預期參數「{0}」> 0，卻收到 {1}" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11438,6 +12042,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "上傳軌跡" @@ -11523,5 +12127,5 @@ msgstr "正在上傳 GPX 軌跡" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "上傳軌跡至 openstreetmap.org" @@ -11532,5 +12136,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "" @@ -11545,11 +12149,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "奇數" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "偶數" @@ -11560,24 +12161,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "編號" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "燃媒" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "使用" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "租車" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11707,5 +12304,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11767,21 +12364,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "選擇自..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "自動來源" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11793,13 +12390,13 @@ "您是否想要回復以 F11 作為抓取動作？" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "回復抓取捷徑鍵 F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM 已停止以便讓變更生效。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11824,17 +12421,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "啟用自動快取。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "最大快取容量 (MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11846,18 +12443,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "法國 cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "當自動來源啓用時設定鍵「source」的數值" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "來源" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11865,5 +12462,5 @@ msgstr "將原始的白色背景以在 JOSM 偏好設定中定義的背景顏色取代。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11871,52 +12468,49 @@ msgstr "反轉原始的黑色與白色（和所有中間的灰色）。當文字在暗色背景中時很有用。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "允許多重圖層堆疊" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "設定 WMS 圖層透明度。右邊是不透明，左邊是透明。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "在從 WMS 伺服器下載的資料周圍繪出一個矩形。" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "抓取較小的圖片（較高的品質但消耗更多記憶體）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "固定大小矩形（預設為 100m）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "固定大小（從 25 到 100 公尺）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "當超過這個大小時較舊的檔案會自動刪除" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "自動標籤來源已加入：" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "將「source=...」加入元件？" @@ -12120,5 +12714,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "位置" @@ -12317,5 +12911,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "沒有載入資料。" @@ -12337,9 +12931,9 @@ msgstr "轉換為沒有時刻的 GPX 圖層" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "編輯 gpx 軌跡" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "編輯Gpx" @@ -12727,7 +13321,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "水域" @@ -12880,19 +13474,19 @@ msgstr "無法擷取圖片" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "正在連線" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "已連線" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "未連線" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "連線失敗" @@ -12931,32 +13525,32 @@ msgstr "LiveGPS 圖層" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "擷取 GPS 軌跡" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "連線至 gpsd 伺服器並在 LiveGPS 圖層中顯示目前的位置。" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "置中一次" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "將 LiveGPS 圖層置中於目前的位置。" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "自動置中" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "持續將 LiveGPS 圖層置中到目前的位置。" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13007,9 +13601,9 @@ msgstr "不能畫到這個世界以外的地方。" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "測量模式" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "測量" @@ -13047,5 +13641,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13056,13 +13650,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13209,5 +13803,5 @@ msgstr "Firefox 可執行檔" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13301,5 +13895,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13375,41 +13969,41 @@ msgstr "輸入重量限制值" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "快速地圖" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "載入拼貼" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "載入所有拼貼" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "增加縮放" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "減少縮放" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "清除拼貼快取" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "圖片 " @@ -13577,4 +14171,43 @@ msgstr "您必須先在偏好設定中指定標籤預設組合來源。" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "偶數" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "最低編號" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "最高編號" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "街道" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "最高編號" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13593,42 +14226,20 @@ msgstr "反轉連棟建築" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "將建築連棟" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "從一長排建築中建立個別建築。" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "選擇至少有四個節點的單一、封閉的路徑。" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "連棟建築" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "最高編號" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "最低編號" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "插入補間" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "街道名稱" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "選用性的" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13643,5 +14254,5 @@ msgstr "沒有驗證上的錯誤" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "格線" @@ -14294,38 +14905,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "建築" @@ -14339,5 +14920,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "區域" @@ -14452,10 +15033,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15173,6 +15754,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "道路編號" @@ -15618,5 +16199,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "寬度 (米)" @@ -15734,5 +16315,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "金屬" @@ -15744,5 +16325,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "木頭" @@ -16000,4 +16581,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16029,8 +16613,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "是" @@ -16178,9 +16764,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "否" @@ -16425,5 +17012,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "居住的" @@ -16458,5 +17045,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "巷/弄" @@ -16490,6 +17077,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "施工" @@ -16539,5 +17126,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "圓環" @@ -16725,6 +17312,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "健走" @@ -16845,5 +17432,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16869,4 +17455,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16876,15 +17463,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "經營者" @@ -17096,7 +17683,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "海拔" @@ -17515,5 +18102,5 @@ msgstr "泥沼" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17523,5 +18110,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "" @@ -18047,32 +18634,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "" @@ -18131,91 +18718,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "24/7" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18230,5 +18817,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18247,7 +18834,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "" @@ -18263,5 +18850,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "地下" @@ -18274,6 +18861,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "費用" @@ -18312,22 +18899,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "商店" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "編輯汽車商店" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "修車場" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "編輯修車場" @@ -18335,5 +18910,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "租車" @@ -18342,10 +18917,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "編輯租車" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "" @@ -18353,5 +18928,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "" @@ -18359,10 +18934,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "編輯自行車停車場" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "容量" @@ -18371,22 +18946,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "編輯自行車租用點" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "編輯自行車商店" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "大眾運輸" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18396,5 +18964,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18402,5 +18970,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18408,5 +18976,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "" @@ -18414,5 +18982,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -18420,5 +18988,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "路面電車停靠" @@ -18427,5 +18995,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "編輯路面電車停靠" @@ -18433,5 +19001,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "鐵路月台" @@ -18440,5 +19008,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "編輯鐵路月台" @@ -18450,5 +19018,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18456,10 +19024,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "區域" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "地下鐵入口" @@ -18468,10 +19036,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "編輯地下鐵入口" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -18480,5 +19048,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "公車車站" @@ -18487,5 +19055,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "編輯公車車站" @@ -18493,5 +19061,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "公車站牌" @@ -18501,5 +19069,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "編輯公車站牌" @@ -18508,17 +19076,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "長椅" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "公車月台" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "編輯公車月台" @@ -18526,5 +19102,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "計程車" @@ -18532,5 +19108,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "編輯計程車招呼站" @@ -18538,5 +19114,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "機場" @@ -18544,15 +19120,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "編輯機場" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "" @@ -18560,10 +19136,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "旅遊" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "住宿" @@ -18575,5 +19151,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "旅館" @@ -18582,15 +19158,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "編輯旅館" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "星級" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "汽車旅館" @@ -18598,20 +19174,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "編輯汽車旅館" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "" @@ -18619,10 +19195,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "" @@ -18630,30 +19206,30 @@ #. item "Travel/Accomodation/Hostel" #. +#: build/trans_presets.java:1596 +msgid "Edit Hostel" +msgstr "" + +#. item "Travel/Accomodation/Hostel" text "Name" +#: build/trans_presets.java:1600 +msgid "Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" +#: build/trans_presets.java:1601 +msgid "Edit Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" text "Elevation" +#: build/trans_presets.java:1606 +msgid "Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" #: build/trans_presets.java:1607 -msgid "Edit Hostel" -msgstr "" - -#. item "Travel/Accomodation/Hostel" text "Name" +msgid "Edit Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" text "Name" #: build/trans_presets.java:1611 -msgid "Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 -msgid "Edit Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 -msgid "Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 -msgid "Edit Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 msgid "Camping Site" msgstr "露營區" @@ -18661,10 +19237,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "編輯露營區" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "食物+飲料" @@ -18675,5 +19251,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "餐廳" @@ -18681,5 +19257,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "編輯餐廳" @@ -18687,5 +19263,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "烹調風格" @@ -18693,61 +19269,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "意大利文" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "中文" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "披薩" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "漢堡" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "希臘文" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "德文" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "印度料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "地方料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "土耳其料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "亞洲料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "泰文" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "墨西哥料理" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "日文" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "速食" @@ -18755,9 +19331,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "編輯速食餐廳" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "咖啡" @@ -18765,9 +19341,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "編輯咖啡廳" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "酒店" @@ -18775,18 +19351,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "編輯酒店" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "酒吧" @@ -18794,9 +19370,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "編輯酒吧" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "夜店" @@ -18804,24 +19380,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "編輯夜店" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "旅遊相關" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "吸引力點" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "編輯吸引力點" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "博物館" @@ -18829,9 +19405,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "編輯博物館" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "動物園" @@ -18840,9 +19416,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "編輯動物園" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "景點" @@ -18850,24 +19426,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "編輯景點" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "主題樂園" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "編輯主題樂園" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "藝術工作" @@ -18875,5 +19451,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "編輯藝術工作" @@ -18881,19 +19457,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "資訊服務處" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "地圖" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18931,5 +19507,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18937,28 +19513,28 @@ msgstr "街" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "城市" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -18968,5 +19544,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18974,6 +19550,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "自行車" @@ -18981,5 +19557,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -18987,6 +19563,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "滑雪" @@ -18994,5 +19570,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19000,46 +19576,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "資訊板" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "歷史" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "自然" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "野生" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19047,29 +19623,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. -#: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 msgid "Phone number" msgstr "電話號碼" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "其他的資訊點" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "" @@ -19077,25 +19653,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "野餐區" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "編輯野餐區" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "歷史地區" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "城堡" @@ -19104,19 +19680,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "編輯城堡" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "遺跡" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "編輯遺跡" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "考古學地區" @@ -19125,9 +19701,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "編輯考古學地區" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "戰場" @@ -19135,10 +19711,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "編輯戰場" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19146,5 +19722,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19152,15 +19728,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "紀念建築" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "編輯紀念建築" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "紀念碑" @@ -19168,55 +19744,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "編輯紀念碑" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 msgid "Leisure" msgstr "休閒" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "水上樂園" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "編輯水上樂園" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "運動場" @@ -19224,35 +19800,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "編輯運動場" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "釣魚" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "編輯釣魚場" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "運動用品" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "運動設施" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "競技場" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "編輯競技揚" @@ -19266,6 +19842,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "選擇運動：" @@ -19657,30 +20233,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "運動" @@ -19690,225 +20266,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "多種" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "射箭" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "田徑" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "澳洲足球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "棒球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "籃球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "保齡球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "獨木舟" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "攀岩" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "木球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "自行車" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "賽狗" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "馬術" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "美式足球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "高爾夫" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "體操" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "曲棍球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "賽馬" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "摩托車" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "橄欖球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "射擊" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "滑雪" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "足球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "游泳" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "桌球" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "網球" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "運動中心" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "編輯運動中心" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "跑道" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "編輯跑道" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "高爾夫路線" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "編輯高爾夫路線" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "迷你高爾夫" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "編輯迷你高爾夫" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "運動" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "多種" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "編輯多種" @@ -19947,21 +20523,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "類型" @@ -20000,203 +20576,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "運動中心" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "競技揚" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "田徑" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "編輯田徑" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "射箭" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "編輯射箭" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "攀岩" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "編輯攀岩" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "獨木舟" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "編輯獨木舟" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "編輯自行車" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "賽狗" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "編輯賽狗" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "馬術" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "編輯馬術" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "賽馬" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "編輯賽馬" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "體操" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "編輯體操" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "摩托車運動" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "編輯摩托車運動" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "溜冰" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "編輯溜冰" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "滑板" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "編輯滑板" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "游泳" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "編輯游泳" @@ -20204,56 +20780,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "編輯滑雪" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "困難度" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "新手" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "容易" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "中級" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "進階" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "專家" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "射擊" @@ -20261,182 +20837,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "編輯射擊" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "運動（球類）" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "足球" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "編輯足球" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "美式足球" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "編輯美式足球" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "澳洲足球" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "編輯澳洲足球" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "棒球" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "編輯棒球" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "籃球" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "編輯籃球" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "高爾夫" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "編輯高爾夫" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "高爾夫路線" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "保齡球" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "編輯保齡球" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "" #. item "Sport (Ball)/Cricket" +#: build/trans_presets.java:2092 +msgid "Edit Cricket" +msgstr "" + +#: build/trans_presets.java:2097 +msgid "Cricket Nets" +msgstr "" + +#. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + #: build/trans_presets.java:2103 -msgid "Edit Cricket" -msgstr "" - -#: build/trans_presets.java:2108 -msgid "Cricket Nets" -msgstr "" - -#. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 msgid "Croquet" msgstr "木球" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "編輯木球" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "曲棍球" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "編曲棍球" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "回力球" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "編輯回力球" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "橄欖球" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "編輯橄欖球" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "桌球" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "編輯桌球" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "網球" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "編輯網路" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "人造物" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "建築物" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "建築物" @@ -20444,5 +21020,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "公共建築" @@ -20450,10 +21026,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "編輯公共建築" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "縣市政府/公所" @@ -20461,10 +21037,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "編輯縣市政府/公所" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "大使館" @@ -20472,10 +21048,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "編輯大使館" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "法院" @@ -20484,10 +21060,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "編輯法院" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "監獄" @@ -20496,10 +21072,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "編輯監獄" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "警察局" @@ -20509,10 +21085,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "編輯警察局" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "消防隊" @@ -20521,10 +21097,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "編輯消防隊" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "郵局" @@ -20532,5 +21108,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "編輯郵局" @@ -20538,15 +21114,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "幼稚園" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "編輯幼稚園" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "學校" @@ -20554,10 +21130,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "編輯學校" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "大學" @@ -20565,10 +21141,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "編輯大學" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "學院" @@ -20576,5 +21152,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "編輯學院" @@ -20582,5 +21158,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "電影院" @@ -20589,10 +21165,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "編輯電影院" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "圖書館" @@ -20601,9 +21177,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "編輯圖書館" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "美術館" @@ -20611,10 +21187,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "編輯美術館" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "劇院" @@ -20623,10 +21199,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "編輯劇院" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "宗教儀式場所" @@ -20636,5 +21212,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "編輯宗教儀式場所" @@ -20643,6 +21219,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "宗教" @@ -20651,66 +21227,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "巴海大同教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "佛教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "基督教系" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "印度教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "耆那教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "猶太教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "回教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "錫克教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "道教" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "祆教" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "教派" @@ -20719,81 +21295,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "英國國教" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "浸信會" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "天主教" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "福音派教會" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "路德教派" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "衛理公會教" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "摩門教" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "東正教" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "聖靈降臨教派" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "長老派教會" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "新教" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "教友派" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "什葉派" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "遜尼派" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "地址" @@ -20802,5 +21378,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "編輯地址資訊" @@ -20808,5 +21384,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "" @@ -20814,20 +21390,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "街道名稱" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "城市名稱" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "郵遞區號" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "國碼" @@ -20836,5 +21417,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "" @@ -20842,61 +21423,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "編號規則" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "奇數" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "偶數" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "按字母順序" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "人造物" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "作品" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "編輯作品" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "塔" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "編輯塔" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "通訊" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "觀測" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "高度（米）" @@ -20904,25 +21485,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "貯水塔" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "編輯貯水塔" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "貯氣桶" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "編輯貯氣桶" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "燈塔" @@ -20930,10 +21511,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "編輯燈塔" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "風車" @@ -20941,10 +21522,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "編輯風車" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "油管" @@ -20953,37 +21534,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "編輯油管" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "天然氣" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "汙水處理廠" @@ -20993,10 +21574,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "編輯汙水處理廠" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "起重機" @@ -21004,10 +21585,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "編輯起重機" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "" @@ -21015,10 +21596,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "測量點" @@ -21026,10 +21607,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "編輯測量點" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "監視" @@ -21037,5 +21618,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "編輯監視攝影機" @@ -21043,5 +21624,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "發電廠" @@ -21051,35 +21632,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "編輯發電廠" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "風力" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "水力" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "燃油" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "核能" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "燃媒" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "光電" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "" @@ -21088,10 +21669,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "" @@ -21100,5 +21681,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "" @@ -21106,10 +21687,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "電塔" @@ -21120,23 +21701,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "編輯電塔" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "電線" @@ -21145,75 +21726,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "編輯電線" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "電壓" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "便利設施" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "廁所" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "郵筒" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "電話" @@ -21222,5 +21803,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "編輯電話" @@ -21228,5 +21809,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "硬幣" @@ -21234,5 +21815,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "" @@ -21240,5 +21821,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "電子錢包或收費卡" @@ -21246,5 +21827,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "" @@ -21252,15 +21833,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "信用卡" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "電話卡" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "資源回收" @@ -21269,5 +21850,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "資源回收站" @@ -21275,68 +21856,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "電池" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "瓶罐" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "衣服" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "玻璃" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "紙張" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "廢金屬" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "長椅" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "材質" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "石頭" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "塑膠" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "顏色" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "黑色" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "淺褐色" @@ -21407,39 +21983,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "綠色" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "紅色" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "藍色" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "灰色" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "白色" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "座椅數量" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "" @@ -21448,30 +22024,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "高度" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "低" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "半高" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "全高" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "隱藏" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "鎖" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "噴泉" @@ -21480,10 +22056,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "編輯噴泉" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "飲水機" @@ -21492,10 +22068,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "編輯飲水機" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21503,33 +22079,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "商店" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "編輯汽車商店" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "編輯自行車商店" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "超級市場" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "編輯超級市場" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "便利商店" @@ -21537,9 +22137,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "編輯便利商店" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "" @@ -21547,27 +22147,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "書店" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "編輯書店" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "旅行社" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "編輯旅行社" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "自動販賣機" @@ -21575,5 +22175,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "編輯自動販賣機" @@ -21581,88 +22181,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "販賣產品" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "食物" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "飲料" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "甜點" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "菸" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "相片" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "飼料" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "報紙" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "玩具" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "郵票" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-卡" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "保險套" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "肉類" @@ -21670,9 +22270,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "編輯肉店" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "麵包類" @@ -21680,9 +22280,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "編輯麵包店" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "花類" @@ -21690,18 +22290,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "編輯花店" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "有機產品" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "編輯有機產品商店" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "酒類" @@ -21709,54 +22309,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "編輯賣酒的商店" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "飲料類" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "編輯飲料店" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "電腦類" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "編輯電腦商店" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "電子材料" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "編輯電子材料行" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "編輯 Hifi 音響店" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "傢俱類" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "編輯傢俱店" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "園藝中心" @@ -21764,9 +22364,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "編輯園藝中心" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21774,9 +22374,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "DIY 商店" @@ -21784,54 +22384,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "編輯 DIY 商店" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "文具類" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "編輯文具店" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "美髮類" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "編輯美髮店" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "鞋類" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "編輯鞋店" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "玩具類" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "編輯玩具店" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "影片類" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "編輯影片類商店" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "乾洗類" @@ -21839,9 +22439,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "編輯乾洗店" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "洗衣店" @@ -21849,9 +22449,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "編輯洗衣店" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "戶外用品" @@ -21859,28 +22459,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "編輯戶外用品店" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "編輯運動用品店" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "眼鏡類" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "編輯眼鏡行" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "現金" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "銀行" @@ -21888,14 +22488,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "編輯銀行" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "自動提款機(ATM)" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "" @@ -21903,5 +22503,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "" @@ -21909,15 +22509,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "編輯自動提款機" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "健康" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "醫師" @@ -21925,18 +22525,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "編輯醫師" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "牙醫" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "編輯牙醫" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "藥局" @@ -21944,5 +22544,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "編輯藥局" @@ -21950,9 +22550,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "配藥" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "醫院" @@ -21960,10 +22560,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "編輯醫院" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -21972,5 +22572,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -21979,20 +22579,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "電話號碼" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(使用國際碼，像是 +12-345-67890)" @@ -22000,5 +22600,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "獸醫" @@ -22007,64 +22607,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "編輯獸醫" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "地理學" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "地名" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "縣" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "編輯縣" @@ -22072,15 +22672,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "市" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "編輯市" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "鄉/鎮" @@ -22088,10 +22688,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "編輯鄉/鎮" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "郊區" @@ -22099,25 +22699,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "編輯郊區" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "村/里" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "編輯村/里" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "" @@ -22125,5 +22725,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "" @@ -22131,10 +22731,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "島嶼" @@ -22142,10 +22742,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "編輯島嶼" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22153,5 +22753,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22159,5 +22759,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "洞窟入口" @@ -22165,10 +22765,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "編輯洞窟入口" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "峰" @@ -22176,10 +22776,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "編輯山峰" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "冰河" @@ -22187,10 +22787,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "編輯冰河" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "火山" @@ -22198,70 +22798,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "編輯火山" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "邊界" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "國界" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "編輯國界" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "行政區" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "編輯行政區邊界" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "城市的" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "編輯城市邊界" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "政治的" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "編輯政治的邊界" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "國家公園" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "編輯國家公園" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "土地利用" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "樹" @@ -22270,15 +22870,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "編輯樹" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "植物學名" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "" @@ -22287,5 +22887,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "" @@ -22293,17 +22893,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "松類" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "落葉類" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "混合" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "森林" @@ -22312,14 +22912,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "編輯森林土地利用" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "自然保育" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "編輯自然保育" @@ -22327,25 +22927,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22353,10 +22953,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "" @@ -22364,5 +22964,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "" @@ -22370,5 +22970,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "" @@ -22377,45 +22977,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "" @@ -22423,25 +23023,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "花園" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "編輯花園" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "草地" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22449,10 +23049,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22460,20 +23060,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "公園" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "編輯公園" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "" @@ -22481,5 +23081,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -22487,15 +23087,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "" @@ -22503,9 +23103,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "" @@ -22513,39 +23113,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "工業區" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "" @@ -22553,15 +23153,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "" @@ -22569,55 +23169,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "" @@ -22627,5 +23227,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "" @@ -22634,10 +23234,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "" @@ -22645,5 +23245,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22652,5 +23252,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22658,34 +23258,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "" @@ -22694,15 +23294,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "" @@ -22710,5 +23310,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22717,5 +23317,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22723,5 +23323,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22793,24 +23393,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "單車" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "公車" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "道路" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "渡輪" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22863,5 +23463,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22870,13 +23470,13 @@ msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "健行" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -22890,10 +23490,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -22901,31 +23501,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "網路" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -22934,30 +23534,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23168,130 +23768,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23308,98 +23782,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "" @@ -23776,7 +24159,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23840,13 +24223,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23862,5 +24324,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23874,5 +24336,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23893,5 +24355,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "" @@ -23906,5 +24368,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23919,5 +24381,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "" @@ -23931,5 +24393,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "" @@ -23943,5 +24405,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "" @@ -23963,16 +24425,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24069,4 +24519,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24135,13 +24592,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24187,6 +24644,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24203,7 +24660,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24226,10 +24683,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24265,11 +24722,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24310,6 +24768,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24323,5 +24781,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "" @@ -24343,5 +24801,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24355,5 +24813,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24361,4 +24819,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24408,7 +24873,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "" @@ -24425,5 +24890,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24438,5 +24903,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24451,5 +24916,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24464,5 +24929,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24477,5 +24942,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24490,5 +24955,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24608,11 +25073,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "" @@ -24626,5 +25091,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "" @@ -24638,5 +25103,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "" @@ -24764,12 +25229,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "" @@ -24783,5 +25265,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "" @@ -24819,4 +25301,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24835,4 +25333,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24853,8 +25359,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -24956,10 +25464,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25213,5 +25721,5 @@ #. #. -#. +#. #. color health #. @@ -25357,4 +25865,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25374,23 +25890,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25422,6 +25938,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25482,14 +25998,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25836,5 +26352,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25857,5 +26372,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "" @@ -25927,8 +26443,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "" @@ -26029,9 +26545,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "" @@ -26119,9 +26635,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "" @@ -26135,5 +26651,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "" @@ -26147,5 +26663,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26167,5 +26683,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "" @@ -26179,5 +26695,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "" @@ -26191,5 +26707,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26212,5 +26728,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "" @@ -26224,5 +26740,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "" @@ -26236,5 +26752,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26248,5 +26764,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26260,5 +26776,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26315,7 +26831,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "" @@ -26329,5 +26845,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "" @@ -26340,5 +26856,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "" @@ -26353,5 +26869,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "" @@ -26365,5 +26881,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "" @@ -26418,8 +26934,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26433,5 +26949,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "" @@ -26445,5 +26961,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "" @@ -26457,5 +26973,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26469,5 +26985,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "" @@ -26481,5 +26997,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "" @@ -26557,8 +27073,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "" @@ -26606,7 +27122,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "" @@ -26756,11 +27272,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "" @@ -26808,6 +27324,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "" @@ -27163,86 +27679,90 @@ msgstr "" +#~ msgid "Updating primitive" +#~ msgstr "正在更新原型" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "需要關閉括弧。" + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -#~ msgstr "無法取消指令「{0}」，因為圖層「{1}」已不存在" - -#~ msgid "Images for {0}" -#~ msgstr "{0} 的圖片" - -#~ msgid "Read GPX..." -#~ msgstr "讀取 GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "點 {0} x {1} 沒有時刻" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "不能讀取點 {1} x {2} 的時刻「{0}」" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "找不到具可讀時刻戳記的圖片。" - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS 開始：{0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS 結束：{0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "目前的差分： {0}秒" - -#~ msgid "timezone difference: " -#~ msgstr "時區差異： " - -#~ msgid "{0} within the track." -#~ msgstr "{0} 在此軌跡中。" - -#~ msgid "Sync clock" -#~ msgstr "同步時鐘" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "檔案「{0}」的日期無法解析。" - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "在檔案「{0}」中沒有 EXIF 時刻。" - -#~ msgid "Image" -#~ msgstr "圖片" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "GPS 單元時區 (不同於照片)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "與 GPS 單元同步時刻" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "輸入的時刻無法解析。" - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - 有 Geotag 的相片" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "以 AgPifoJ 開啟圖片..." - -#~ msgid "osmarender options" -#~ msgstr "osmarender 選項" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" +#~ msgstr "目前的變更數超過最大值。變更的數量，目前為 {0}，最大值為 {1}" + +#~ msgid "User with the same uid but different name found" +#~ msgstr "發現同一 uid 的使用者但姓名卻不同" #~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "JOSM 的另一個 geotag 外掛程式。將相片與 GPS 軌跡關聯或匯入 EXIF 已有 " -#~ "geotag 的相片。" - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "許多能讓您的生活更輕鬆的公用程式：例如簡化路徑、連結區域、跳至位置。" - -#~ msgid "File could not be found." -#~ msgstr "找不到檔案" +#~ "I can take a picture of my GPS receiver.
Can this help?" +#~ msgstr "我的 GPS 接收器可以拍照。
這樣有幫助嗎？" + +#~ msgid "All images" +#~ msgstr "所有圖片" + +#~ msgid "Images with no exif position" +#~ msgstr "圖片沒有 exif 位置" + +#~ msgid "Not yet tagged images" +#~ msgstr "尚未加上標籤的圖片" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPX 軌跡已載入" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "在軌跡與相片間的補償：{0}分 {1}秒" + +#~ msgid "Default Values" +#~ msgstr "預設值" + +#~ msgid "Enable proxy server" +#~ msgstr "啟用代理伺服器" + +#~ msgid "Anonymous" +#~ msgstr "匿名" + +#~ msgid "Proxy server host" +#~ msgstr "代理伺服器主機" + +#~ msgid "Proxy server port" +#~ msgstr "代理伺服器連接埠" + +#~ msgid "Proxy server username" +#~ msgstr "代理伺服器使用者名稱" + +#~ msgid "Proxy server password" +#~ msgstr "代理伺服器密碼" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "空指標例外(NullPointerException)，可能是缺少標籤。" + +#~ msgid "Preparing..." +#~ msgstr "正在準備..." + +#~ msgid "Uploading..." +#~ msgstr "正在上傳..." + +#~ msgid "Incorrect password or username." +#~ msgstr "不正確的密碼或使用者名稱。" + +#~ msgid "Enter Password" +#~ msgstr "輸入密碼" + +#~ msgid "Login" +#~ msgstr "登入" + +#~ msgid "Auto-tag source added:" +#~ msgstr "自動標籤來源已加入：" + +#~ msgid "Interpolation" +#~ msgstr "插入補間" + +#~ msgid "Optional" +#~ msgstr "選用性的" + +#~ msgid "Shop" +#~ msgstr "商店" #~ msgid "Combine Anyway" @@ -27420,7 +27940,28 @@ #~ msgstr "縮放" +#~ msgid "No images with readable timestamps found." +#~ msgstr "找不到具可讀時刻戳記的圖片。" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "檔案「{0}」的日期無法解析。" + +#~ msgid "Image" +#~ msgstr "圖片" + #~ msgid "Public" #~ msgstr "公開" +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "在檔案「{0}」中沒有 EXIF 時刻。" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS 單元時區 (不同於照片)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "與 GPS 單元同步時刻" + #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "不能開啓偏好設定目錄：{0}" @@ -27464,4 +28005,34 @@ #~ msgid "Please enter a search string" #~ msgstr "請輸入搜尋字串" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "不能讀取點 {1} x {2} 的時刻「{0}」" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "點 {0} x {1} 沒有時刻" + +#~ msgid "Images for {0}" +#~ msgstr "{0} 的圖片" + +#~ msgid "Read GPX..." +#~ msgstr "讀取 GPX..." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS 開始：{0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS 結束：{0}" + +#~ msgid "timezone difference: " +#~ msgstr "時區差異： " + +#~ msgid "Time entered could not be parsed." +#~ msgstr "輸入的時刻無法解析。" + +#~ msgid "{0} within the track." +#~ msgstr "{0} 在此軌跡中。" + +#~ msgid "Sync clock" +#~ msgstr "同步時鐘" #~ msgid "" @@ -27598,7 +28169,13 @@ #~ msgstr "檢驗目前的選擇區域或整個資料組合。" +#~ msgid "current delta: {0}s" +#~ msgstr "目前的差分： {0}秒" + #~ msgid "Please report a ticket at {0}" #~ msgstr "請在 {0} 回報為 ticket" +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - 有 Geotag 的相片" + #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "使用群組「{1}」的預設組合「{0}」" @@ -27607,4 +28184,7 @@ #~ msgstr "使用預設組合「{0}」" +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "以 AgPifoJ 開啟圖片..." + #~ msgid "Lambert Zone 4 cache file (.4)" #~ msgstr "蘭勃特區 4 快取檔案 (.4)" @@ -27619,4 +28199,7 @@ #~ msgstr "先將投影改變為 {0}。" +#~ msgid "osmarender options" +#~ msgstr "osmarender 選項" + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "初始化 API 失敗。請稍後再試一次。" @@ -27651,7 +28234,4 @@ #~ msgid "Open User Page" #~ msgstr "開啟使用者頁面" - -#~ msgid "Reached a junction" -#~ msgstr "到達交會點" #~ msgid "Reached the end of the line" @@ -27712,4 +28292,11 @@ #~ msgstr "% 經度：" +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "JOSM 的另一個 geotag 外掛程式。將相片與 GPS 軌跡關聯或匯入 EXIF 已有 " +#~ "geotag 的相片。" + #~ msgid "Directly load TCX files from JOSM." #~ msgstr "直接從 JOSM 載入 TCX 檔案。" @@ -27722,4 +28309,10 @@ #~ "取的作者個人資料頁面。" +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "許多能讓您的生活更輕鬆的公用程式：例如簡化路徑、連結區域、跳至位置。" + #~ msgid "API initialization failed" #~ msgstr "API 初始化失敗" @@ -27800,2 +28393,6 @@ #~ msgid "unexpected null value for n.getEastNorth(). id of n is" #~ msgstr "在 n.getEastNorth() 有未預期的空值(null)。n 的 id 為" + +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "無法取消指令「{0}」，因為圖層「{1}」已不存在"